Skip to content

Commit 022035a

Browse files
authored
CMake 3.24+: ZLIB_USE_STATIC_LIBS (#1410)
Recent CMake versions add a control variable to ensure only a static zlib is picked up.
1 parent a6f5131 commit 022035a

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN curl -sLo c-blosc-1.15.0.tar.gz https://github.com/Blosc/c-blosc/arch
5252
&& PY_TARGET=${PY_VERSIONS%% *} \
5353
&& PY_BIN=/opt/python/cp${PY_TARGET:0:2}-cp${PY_TARGET}/bin/python \
5454
&& CMAKE_BIN="$(${PY_BIN} -m pip show cmake 2>/dev/null | grep Location | cut -d' ' -f2)/cmake/data/bin/" \
55-
&& PATH=${CMAKE_BIN}:${PATH} cmake -DDEACTIVATE_SNAPPY=ON -DBUILD_SHARED=OFF -DBUILD_TESTS=OFF -DBUILD_BENCHMARKS=OFF -DCMAKE_INSTALL_PREFIX=/usr ../c-blosc-* \
55+
&& PATH=${CMAKE_BIN}:${PATH} cmake -DDEACTIVATE_SNAPPY=ON -DBUILD_SHARED=OFF -DBUILD_TESTS=OFF -DBUILD_BENCHMARKS=OFF -DPREFER_EXTERNAL_ZLIB=ON -DZLIB_USE_STATIC_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr ../c-blosc-* \
5656
&& make \
5757
&& make install
5858

@@ -74,7 +74,7 @@ RUN curl -sLo adios2-2.7.1.tar.gz https://github.com/ornladios/ADIOS2/arc
7474
&& PY_TARGET=${PY_VERSIONS%% *} \
7575
&& PY_BIN=/opt/python/cp${PY_TARGET:0:2}-cp${PY_TARGET}/bin/python \
7676
&& CMAKE_BIN="$(${PY_BIN} -m pip show cmake 2>/dev/null | grep Location | cut -d' ' -f2)/cmake/data/bin/" \
77-
&& PATH=${CMAKE_BIN}:${PATH} cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DADIOS2_BUILD_EXAMPLES=OFF -DADIOS2_BUILD_TESTING=OFF -DCMAKE_DISABLE_FIND_PACKAGE_LibFFI=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BISON=TRUE -DCMAKE_INSTALL_PREFIX=/usr ../ADIOS2-* \
77+
&& PATH=${CMAKE_BIN}:${PATH} cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DADIOS2_BUILD_EXAMPLES=OFF -DADIOS2_BUILD_TESTING=OFF -DZLIB_USE_STATIC_LIBS=ON -DCMAKE_DISABLE_FIND_PACKAGE_LibFFI=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BISON=TRUE -DCMAKE_INSTALL_PREFIX=/usr ../ADIOS2-* \
7878
&& make \
7979
&& make install
8080

@@ -83,6 +83,7 @@ ADD . /opt/src
8383
RUN ls /opt/python/
8484

8585
ENV HDF5_USE_STATIC_LIBRARIES=ON \
86+
ZLIB_USE_STATIC_LIBS=ON \
8687
ADIOS_USE_STATIC_LIBS=ON \
8788
openPMD_BUILD_TESTING=OFF \
8889
openPMD_BUILD_EXAMPLES=OFF
@@ -103,6 +104,7 @@ RUN cd /opt/src; \
103104
# && /opt/cmake/bin/cmake \
104105
# -DPython_ROOT_DIR=$(which /opt/python/cp${PY_TARGET}-cp${PY_TARGET}m) \
105106
# -DHDF5_USE_STATIC_LIBRARIES=ON \
107+
# -DZLIB_USE_STATIC_LIBS=ON \
106108
# -DBUILD_SHARED_LIBS=OFF \
107109
# -DopenPMD_BUILD_TESTING=OFF \
108110
# -DopenPMD_BUILD_EXAMPLES=OFF \

0 commit comments

Comments
 (0)