Skip to content

Commit 2238b96

Browse files
authored
Merge pull request #14648 from jacquesqiao/fix-gzstream-zlib-dependency
gzstream depend on the zlib in thirdparty
2 parents b4de023 + bcad29c commit 2238b96

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

cmake/external/gzstream.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ SET(GZSTREAM_INCLUDE_DIR "${GZSTREAM_INSTALL_DIR}/include/" CACHE PATH "gzstream
2727

2828
ExternalProject_Add(
2929
extern_gzstream
30+
DEPENDS zlib
3031
GIT_REPOSITORY "https://github.com/jacquesqiao/gzstream.git"
3132
GIT_TAG ""
3233
PREFIX ${GZSTREAM_SOURCES_DIR}
3334
UPDATE_COMMAND ""
3435
CONFIGURE_COMMAND ""
3536
BUILD_IN_SOURCE 1
36-
BUILD_COMMAND make -j8
37+
BUILD_COMMAND make EXTERN_CPPFLAGS="-I${THIRD_PARTY_PATH}/install/zlib/include" EXTERM_LDFLAGS="-L${THIRD_PARTY_PATH}/install/zlib/lib" -j8
3738
INSTALL_COMMAND mkdir -p ${GZSTREAM_INSTALL_DIR}/lib/ && mkdir -p ${GZSTREAM_INSTALL_DIR}/include/
3839
&& cp ${GZSTREAM_SOURCES_DIR}/src/extern_gzstream/libgzstream.a ${GZSTREAM_INSTALL_DIR}/lib
3940
&& cp -r ${GZSTREAM_SOURCES_DIR}/src/extern_gzstream/gzstream.h ${GZSTREAM_INSTALL_DIR}/include

0 commit comments

Comments
 (0)