From 19c3caf4c3a833fc38f01eb47550ac73ac9b4f24 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Wed, 22 Sep 2021 11:41:43 +0800 Subject: [PATCH] refact --- include/tkv/tkv.h | 0 {src/util/inc => include/util}/tkey.h | 11 +++-------- src/mnode/CMakeLists.txt | 17 +++++++---------- src/mnode/CMakeLists.txt.in | 10 ++++++++++ src/tkv/CMakeLists.txt | 7 +++++++ 5 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 include/tkv/tkv.h rename {src/util/inc => include/util}/tkey.h (76%) create mode 100644 src/mnode/CMakeLists.txt.in create mode 100644 src/tkv/CMakeLists.txt diff --git a/include/tkv/tkv.h b/include/tkv/tkv.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/util/inc/tkey.h b/include/util/tkey.h similarity index 76% rename from src/util/inc/tkey.h rename to include/util/tkey.h index 28a0d3a84e..b71cdb2868 100644 --- a/src/util/inc/tkey.h +++ b/include/util/tkey.h @@ -19,15 +19,10 @@ extern "C" { #endif -#include -#include -#include "tmd5.h" -#include "tutil.h" - unsigned char *base64_decode(const char *value, int inlen, int *outlen); -char *base64_encode(const unsigned char *value, int vlen); -char *taosDesEncode(int64_t key, char *src, int len); -char *taosDesDecode(int64_t key, char *src, int len); +char * base64_encode(const unsigned char *value, int vlen); +char * taosDesEncode(int64_t key, char *src, int len); +char * taosDesDecode(int64_t key, char *src, int len); #ifdef __cplusplus } diff --git a/src/mnode/CMakeLists.txt b/src/mnode/CMakeLists.txt index a7fc54d877..54b67f6530 100644 --- a/src/mnode/CMakeLists.txt +++ b/src/mnode/CMakeLists.txt @@ -1,10 +1,7 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20) -PROJECT(TDengine) - -INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc) -INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/dnode/inc) - -INCLUDE_DIRECTORIES(inc) -AUX_SOURCE_DIRECTORY(src SRC) - -ADD_LIBRARY(mnode ${SRC}) +aux_source_directory(source MNODE_SRC) +add_library(mnode ${MNODE_SRC}) +target_include_directories( + mnode + PUBLIC "${CMAKE_SOURCE_DIR}/include/mnode" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include" +) \ No newline at end of file diff --git a/src/mnode/CMakeLists.txt.in b/src/mnode/CMakeLists.txt.in new file mode 100644 index 0000000000..a7fc54d877 --- /dev/null +++ b/src/mnode/CMakeLists.txt.in @@ -0,0 +1,10 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20) +PROJECT(TDengine) + +INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc) +INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/dnode/inc) + +INCLUDE_DIRECTORIES(inc) +AUX_SOURCE_DIRECTORY(src SRC) + +ADD_LIBRARY(mnode ${SRC}) diff --git a/src/tkv/CMakeLists.txt b/src/tkv/CMakeLists.txt new file mode 100644 index 0000000000..264a95685f --- /dev/null +++ b/src/tkv/CMakeLists.txt @@ -0,0 +1,7 @@ +aux_source_directory(source TKV_SRC) +add_library(tkv ${TKV_SRC}) +target_include_directories( + tkv + PUBLIC "${CMAKE_SOURCE_DIR}/include/tkv" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include" +) \ No newline at end of file -- GitLab