diff --git a/CMakeLists.txt b/CMakeLists.txt index 9533514ebc..e16c93c1f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,9 @@ endif(${BUILD_TEST}) ## lz4 cat("${CMAKE_SUPPORT_DIR}/lz4_CMakeLists.txt.in" ${DEPS_TMP_FILE}) +## zlib +cat("${CMAKE_SUPPORT_DIR}/zlib_CMakeLists.txt.in" ${DEPS_TMP_FILE}) + ## cJson cat("${CMAKE_SUPPORT_DIR}/cjson_CMakeLists.txt.in" ${DEPS_TMP_FILE}) diff --git a/cmake/cjson_CMakeLists.txt.in b/cmake/cjson_CMakeLists.txt.in index 83f34ae794..9995d1f8d8 100644 --- a/cmake/cjson_CMakeLists.txt.in +++ b/cmake/cjson_CMakeLists.txt.in @@ -4,7 +4,7 @@ ExternalProject_Add(cjson GIT_REPOSITORY git@github.com:taosdata-contrib/cJSON.git GIT_TAG v1.7.15 SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/cJson" - BINARY_DIR "${CMAKE_BINARY_DIR}/cJson-build" + BINARY_DIR "" CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" diff --git a/cmake/gtest_CMakeLists.txt.in b/cmake/gtest_CMakeLists.txt.in index 6de66e23de..655870e0c9 100644 --- a/cmake/gtest_CMakeLists.txt.in +++ b/cmake/gtest_CMakeLists.txt.in @@ -4,7 +4,7 @@ ExternalProject_Add(googletest GIT_REPOSITORY git@github.com:taosdata-contrib/googletest.git GIT_TAG release-1.11.0 SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/googletest" - BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build" + BINARY_DIR "" CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" diff --git a/cmake/lz4_CMakeLists.txt.in b/cmake/lz4_CMakeLists.txt.in index 56e5fbd258..5dba4f2ab1 100644 --- a/cmake/lz4_CMakeLists.txt.in +++ b/cmake/lz4_CMakeLists.txt.in @@ -4,7 +4,7 @@ ExternalProject_Add(lz4 GIT_REPOSITORY git@github.com:taosdata-contrib/lz4.git GIT_TAG v1.9.3 SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/lz4" - BINARY_DIR "${CMAKE_BINARY_DIR}/lz4-build" + BINARY_DIR "" CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" diff --git a/cmake/zlib_CMakeLists.txt.in b/cmake/zlib_CMakeLists.txt.in new file mode 100644 index 0000000000..c997fc7983 --- /dev/null +++ b/cmake/zlib_CMakeLists.txt.in @@ -0,0 +1,13 @@ + +# zlib +ExternalProject_Add(zlib + GIT_REPOSITORY git@github.com:taosdata-contrib/zlib.git + GIT_TAG v1.2.11 + SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/zlib" + BINARY_DIR "" + #BUILD_IN_SOURCE TRUE + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" + TEST_COMMAND "" +) \ No newline at end of file diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 1d8eac00aa..0e08be44ac 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -4,3 +4,9 @@ endif(${BUILD_TEST}) add_subdirectory(cJson) add_subdirectory(lz4/build/cmake) +add_subdirectory(zlib) +target_include_directories( + zlib + PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/zlib +)