diff --git a/cmake/zstd_CMakeLists.txt.in b/cmake/zstd_CMakeLists.txt.in index c41b3cedd6..4c9ee5b194 100644 --- a/cmake/zstd_CMakeLists.txt.in +++ b/cmake/zstd_CMakeLists.txt.in @@ -4,9 +4,11 @@ ExternalProject_Add(zstd GIT_REPOSITORY https://github.com/facebook/zstd.git GIT_TAG v1.5.5 SOURCE_DIR "${TD_CONTRIB_DIR}/zstd" + DOWNLOAD_DIR "${TD_CONTRIB_DIR}/deps-download" BINARY_DIR "" - CONFIGURE_COMMAND "" - BUILD_COMMAND make -j4 + CMAKE_COMMAND + CMAKE_ARGS ${TD_CONTRIB_DIR}/zstd/build/cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=${CMAKE_BINARY_DIR}/build/lib + BUILD_COMMAND make -j4 INSTALL_COMMAND "" TEST_COMMAND "" ) \ No newline at end of file diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index ae072fa7c4..e98d3d73a9 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -110,7 +110,6 @@ cat("${TD_SUPPORT_DIR}/zlib_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) cat("${TD_SUPPORT_DIR}/cjson_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) # zstd -cat("${TD_SUPPORT_DIR}/zstd_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) if (${BUILD_CONTRIB}) if(${BUILD_WITH_ROCKSDB}) @@ -130,6 +129,7 @@ else() endif() endif() +cat("${TD_SUPPORT_DIR}/zstd_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) #libuv if(${BUILD_WITH_UV}) cat("${TD_SUPPORT_DIR}/libuv_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) @@ -430,6 +430,9 @@ if(${BUILD_PTHREAD}) target_link_libraries(pthread INTERFACE libpthreadVC3) endif() + +#target_link_libraries(zstd) +#target_include_directories() # jemalloc if(${JEMALLOC_ENABLED}) include(ExternalProject) diff --git a/source/dnode/mgmt/CMakeLists.txt b/source/dnode/mgmt/CMakeLists.txt index 762b8fd529..61bd4067c1 100644 --- a/source/dnode/mgmt/CMakeLists.txt +++ b/source/dnode/mgmt/CMakeLists.txt @@ -25,6 +25,6 @@ IF (TD_LINUX_64 AND JEMALLOC_ENABLED) ADD_DEPENDENCIES(taosd jemalloc) target_link_libraries(taosd dnode ${LINK_JEMALLOC}) ELSE () - target_link_libraries(taosd dnode) + target_link_libraries(taosd dnode zstd) ENDIF () diff --git a/source/dnode/vnode/CMakeLists.txt b/source/dnode/vnode/CMakeLists.txt index 2c57eb3cb5..68c5be13d9 100644 --- a/source/dnode/vnode/CMakeLists.txt +++ b/source/dnode/vnode/CMakeLists.txt @@ -144,6 +144,11 @@ else() endif() endif() +target_link_directories( + vnode + PUBLIC "${CMAKE_BINARY_DIR}/build/lib" +) + target_link_libraries( vnode PUBLIC os @@ -160,6 +165,7 @@ target_link_libraries( # PUBLIC bdb # PUBLIC scalar + PUBLIC zstd PUBLIC rocksdb PUBLIC transport PUBLIC stream