refact

include/util/tkey.h

@@ -19,15 +19,10 @@
 extern "C" {
 #endif
 
-#include <stdbool.h>
-#include <stdint.h>
-#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 *         base64_encode(const unsigned char *value, int vlen);
-char *taosDesEncode(int64_t key, char *src, int len);
+char *         taosDesEncode(int64_t key, char *src, int len);
-char *taosDesDecode(int64_t key, char *src, int len);
+char *         taosDesDecode(int64_t key, char *src, int len);
 
 #ifdef __cplusplus
 }

src/mnode/CMakeLists.txt

@@ -1,10 +1,7 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
+aux_source_directory(source MNODE_SRC)
-PROJECT(TDengine)
+add_library(mnode ${MNODE_SRC})
-
+target_include_directories(
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
+    mnode
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/dnode/inc)
+    PUBLIC "${CMAKE_SOURCE_DIR}/include/mnode"
-
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include"
-INCLUDE_DIRECTORIES(inc)
+)
-AUX_SOURCE_DIRECTORY(src SRC)
-
-ADD_LIBRARY(mnode ${SRC})

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})

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"
+)