From 54294f64798847c37ffbd839d0c0d44e6fd5e30d Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Sun, 24 Mar 2024 09:24:40 +0000 Subject: [PATCH] refactor code --- cmake/lzma_CMakeLists.txt.in | 12 ++++++++++++ cmake/xz_CMakeLists.txt.in | 1 + contrib/CMakeLists.txt | 4 ++++ source/dnode/vnode/CMakeLists.txt | 2 +- source/util/CMakeLists.txt | 8 +++++++- 5 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 cmake/lzma_CMakeLists.txt.in diff --git a/cmake/lzma_CMakeLists.txt.in b/cmake/lzma_CMakeLists.txt.in new file mode 100644 index 0000000000..ec16983a52 --- /dev/null +++ b/cmake/lzma_CMakeLists.txt.in @@ -0,0 +1,12 @@ + +# xz +ExternalProject_Add(lzma2 + GIT_REPOSITORY https://github.com/conor42/fast-lzma2.git + SOURCE_DIR "${TD_CONTRIB_DIR}/lzma2" + #BINARY_DIR "" + BUILD_IN_SOURCE TRUE + CONFIGURE_COMMAND "" + BUILD_COMMAND make + INSTALL_COMMAND "" + TEST_COMMAND "" +) \ No newline at end of file diff --git a/cmake/xz_CMakeLists.txt.in b/cmake/xz_CMakeLists.txt.in index 927f990551..6287cad076 100644 --- a/cmake/xz_CMakeLists.txt.in +++ b/cmake/xz_CMakeLists.txt.in @@ -6,6 +6,7 @@ ExternalProject_Add(xz SOURCE_DIR "${TD_CONTRIB_DIR}/xz" BINARY_DIR "" #BUILD_IN_SOURCE TRUE + CMAKE_ARGS CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 7132c1eb3a..d3817ee7b2 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -112,6 +112,10 @@ cat("${TD_SUPPORT_DIR}/cjson_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) # xz cat("${TD_SUPPORT_DIR}/xz_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) +#lzma2 +cat("${TD_SUPPORT_DIR}/lzma_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) + + if (${BUILD_CONTRIB}) if(${BUILD_WITH_ROCKSDB}) cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) diff --git a/source/dnode/vnode/CMakeLists.txt b/source/dnode/vnode/CMakeLists.txt index ded4f5dee2..34669ec578 100644 --- a/source/dnode/vnode/CMakeLists.txt +++ b/source/dnode/vnode/CMakeLists.txt @@ -133,7 +133,7 @@ else() PUBLIC "${TD_SOURCE_DIR}/include/dnode/vnode" ) if (${TD_LINUX}) - target_include_directories( + target_include_directories( vnode PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static" ) diff --git a/source/util/CMakeLists.txt b/source/util/CMakeLists.txt index e95cce9a06..2f79314fcf 100644 --- a/source/util/CMakeLists.txt +++ b/source/util/CMakeLists.txt @@ -20,11 +20,17 @@ target_include_directories( PRIVATE "${GRANT_CFG_INCLUDE_DIR}" PRIVATE "${TD_SOURCE_DIR}/utils/TSZ/sz/inc" PRIVATE "${TD_SOURCE_DIR}/utils/TSZ/zstd/" + PRIVATE "${TD_SOURCE_DIR}/contrib/lzma2/" +) + +target_link_directories( + util + PUBLIC "${TD_SOURCE_DIR}/contrib/lzma2" ) target_link_libraries( util PUBLIC os - PUBLIC lz4_static + PUBLIC lz4_static libfast-lzma2 PUBLIC api cjson geos_c TSZ )