Skip to content

Commit 382b869

Browse files
committed
option
1 parent 8426203 commit 382b869

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
nlohmann_json pybind11_json "numpy<2" \
6363
"pytest==7.1.1" bzip2 sqlite zlib zstd libffi \
6464
exceptiongroup emscripten-abi==${{matrix.emsdk_ver}} \
65-
openssl liblzma
65+
openssl
6666
6767
6868
mkdir build

CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ option(WITH_NODE_TESTS "With node tests" OFF)
77
option(LINK_LIBEXPAT "Link libexpat" OFF)
88
option(LINK_LIBMPDEC "Link libmpdec" OFF)
99

10+
option(LINK_LIBLZMA "Link liblzma" OFF)
11+
1012
# set PY_VERSION to 3.11 if the user has not set it
1113
if (NOT DEFINED PY_VERSION)
1214
set(PY_VERSION 3.11)
@@ -152,10 +154,12 @@ SET(PYTHON_UTIL_LIBS
152154
${CMAKE_INSTALL_PREFIX}/lib/libssl.a
153155
# crypto
154156
${CMAKE_INSTALL_PREFIX}/lib/libcrypto.a
155-
# lzma
156-
${CMAKE_INSTALL_PREFIX}/lib/liblzma.a
157157
)
158158

159+
if(LINK_LIBLZMA)
160+
SET(PYTHON_UTIL_LIBS ${PYTHON_UTIL_LIBS} ${CMAKE_INSTALL_PREFIX}/lib/liblzma.a)
161+
endif()
162+
159163

160164
if (LINK_LIBEXPAT)
161165
SET(PYTHON_UTIL_LIBS ${PYTHON_UTIL_LIBS} ${CMAKE_INSTALL_PREFIX}/lib/libexpat.a)

build_mkdocs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if [ ! -d "$WASM_ENV_PREFIX" ]; then
2424
python=$PYTHON_VERSION "pybind11" nlohmann_json pybind11_json numpy \
2525
bzip2 sqlite zlib zstd libffi exceptiongroup\
2626
"xeus" "xeus-lite" xeus-python "xeus-javascript" xtl "ipython=8.22.2=py311had7285e_1" "traitlets>=5.14.2" \
27-
openssl liblzma
27+
openssl
2828

2929
else
3030
echo "Wasm env $WASM_ENV_NAME already exists"

0 commit comments

Comments
 (0)