From eee1fd2fb22abffef84bdb98e2f465714886a11d Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Fri, 24 Sep 2021 10:47:02 +0800 Subject: [PATCH 1/2] add zlib dependency --- CMakeLists.txt | 3 +++ cmake/cjson_CMakeLists.txt.in | 2 +- cmake/gtest_CMakeLists.txt.in | 2 +- cmake/lz4_CMakeLists.txt.in | 2 +- cmake/zlib_CMakeLists.txt.in | 13 +++++++++++++ deps/CMakeLists.txt | 6 ++++++ 6 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 cmake/zlib_CMakeLists.txt.in 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 +) From 70fbff751d7ddfffa2ca19838599309c4672f2ae Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Fri, 24 Sep 2021 14:11:00 +0800 Subject: [PATCH 2/2] change asvc to transport --- include/libs/{asvc/asvc.h => transport/transport.h} | 6 +++--- source/libs/CMakeLists.txt | 2 +- source/libs/asvc/CMakeLists.txt | 7 ------- source/libs/transport/CMakeLists.txt | 7 +++++++ .../{asvc/inc/asvcInt.h => transport/inc/transportInt.h} | 6 +++--- source/libs/{asvc/src/asvc.c => transport/src/transport.c} | 0 .../asvcTests.cpp => transport/test/transportTests.cpp} | 0 7 files changed, 14 insertions(+), 14 deletions(-) rename include/libs/{asvc/asvc.h => transport/transport.h} (90%) delete mode 100644 source/libs/asvc/CMakeLists.txt create mode 100644 source/libs/transport/CMakeLists.txt rename source/libs/{asvc/inc/asvcInt.h => transport/inc/transportInt.h} (88%) rename source/libs/{asvc/src/asvc.c => transport/src/transport.c} (100%) rename source/libs/{asvc/test/asvcTests.cpp => transport/test/transportTests.cpp} (100%) diff --git a/include/libs/asvc/asvc.h b/include/libs/transport/transport.h similarity index 90% rename from include/libs/asvc/asvc.h rename to include/libs/transport/transport.h index f8c6977269..2733108825 100644 --- a/include/libs/asvc/asvc.h +++ b/include/libs/transport/transport.h @@ -13,8 +13,8 @@ * along with this program. If not, see . */ -#ifndef _TD_ASVC_H_ -#define _TD_ASVC_H_ +#ifndef _TD_TRANSPORT_H_ +#define _TD_TRANSPORT_H_ #ifdef __cplusplus extern "C" { @@ -24,4 +24,4 @@ extern "C" { } #endif -#endif /*_TD_ASVC_H_*/ \ No newline at end of file +#endif /*_TD_TRANSPORT_H_*/ \ No newline at end of file diff --git a/source/libs/CMakeLists.txt b/source/libs/CMakeLists.txt index c19a9da7d8..ed6d2bef4f 100644 --- a/source/libs/CMakeLists.txt +++ b/source/libs/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(asvc) +add_subdirectory(transport) add_subdirectory(raft) add_subdirectory(tkv) add_subdirectory(index) diff --git a/source/libs/asvc/CMakeLists.txt b/source/libs/asvc/CMakeLists.txt deleted file mode 100644 index 11c2e0bf59..0000000000 --- a/source/libs/asvc/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -aux_source_directory(src ASVC_SRC) -add_library(asvc ${ASVC_SRC}) -target_include_directories( - asvc - PUBLIC "${CMAKE_SOURCE_DIR}/include/libs/asvc" - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" -) \ No newline at end of file diff --git a/source/libs/transport/CMakeLists.txt b/source/libs/transport/CMakeLists.txt new file mode 100644 index 0000000000..c01996cb8c --- /dev/null +++ b/source/libs/transport/CMakeLists.txt @@ -0,0 +1,7 @@ +aux_source_directory(src TRANSPORT_SRC) +add_library(transport ${TRANSPORT_SRC}) +target_include_directories( + transport + PUBLIC "${CMAKE_SOURCE_DIR}/include/libs/transport" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" +) \ No newline at end of file diff --git a/source/libs/asvc/inc/asvcInt.h b/source/libs/transport/inc/transportInt.h similarity index 88% rename from source/libs/asvc/inc/asvcInt.h rename to source/libs/transport/inc/transportInt.h index e32a2ea70b..24a2e0ef89 100644 --- a/source/libs/asvc/inc/asvcInt.h +++ b/source/libs/transport/inc/transportInt.h @@ -13,8 +13,8 @@ * along with this program. If not, see . */ -#ifndef _TD_ASVC_INT_H_ -#define _TD_ASVC_INT_H_ +#ifndef _TD_TRANSPORT_INT_H_ +#define _TD_TRANSPORT_INT_H_ #ifdef __cplusplus extern "C" { @@ -24,4 +24,4 @@ extern "C" { } #endif -#endif /*_TD_ASVC_INT_H_*/ \ No newline at end of file +#endif /*_TD_TRANSPORT_INT_H_*/ \ No newline at end of file diff --git a/source/libs/asvc/src/asvc.c b/source/libs/transport/src/transport.c similarity index 100% rename from source/libs/asvc/src/asvc.c rename to source/libs/transport/src/transport.c diff --git a/source/libs/asvc/test/asvcTests.cpp b/source/libs/transport/test/transportTests.cpp similarity index 100% rename from source/libs/asvc/test/asvcTests.cpp rename to source/libs/transport/test/transportTests.cpp