From 6fffcda7fa478144132abbc49180a310ce1eed80 Mon Sep 17 00:00:00 2001 From: hzcheng Date: Tue, 10 Mar 2020 03:57:20 +0000 Subject: [PATCH] more --- src/CMakeLists.txt | 14 +++++++------- src/client/CMakeLists.txt | 4 ++-- src/vnode/CMakeLists.txt | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e1fbefaf71..a05cc0224a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,11 +9,11 @@ ADD_SUBDIRECTORY(common) ADD_SUBDIRECTORY(util) ADD_SUBDIRECTORY(rpc) ADD_SUBDIRECTORY(client) -# ADD_SUBDIRECTORY(kit) -# ADD_SUBDIRECTORY(plugins) -# ADD_SUBDIRECTORY(sdb) -# ADD_SUBDIRECTORY(mnode) -# ADD_SUBDIRECTORY(vnode) -# ADD_SUBDIRECTORY(dnode) -# ADD_SUBDIRECTORY(query) +ADD_SUBDIRECTORY(query) +ADD_SUBDIRECTORY(kit) +ADD_SUBDIRECTORY(plugins) +ADD_SUBDIRECTORY(sdb) +ADD_SUBDIRECTORY(mnode) +ADD_SUBDIRECTORY(vnode) +ADD_SUBDIRECTORY(dnode) #ADD_SUBDIRECTORY(connector/jdbc) diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index 827c65435d..a64f0581fb 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -15,13 +15,13 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) # set the static lib name ADD_LIBRARY(taos_static STATIC ${SRC}) - TARGET_LINK_LIBRARIES(taos_static query trpc tutil pthread m rt) + TARGET_LINK_LIBRARIES(taos_static common query trpc tutil pthread m rt) SET_TARGET_PROPERTIES(taos_static PROPERTIES OUTPUT_NAME "taos_static") SET_TARGET_PROPERTIES(taos_static PROPERTIES CLEAN_DIRECT_OUTPUT 1) # generate dynamic library (*.so) ADD_LIBRARY(taos SHARED ${SRC}) - TARGET_LINK_LIBRARIES(taos trpc tutil pthread m rt) + TARGET_LINK_LIBRARIES(taos common trpc tutil pthread m rt) SET_TARGET_PROPERTIES(taos PROPERTIES CLEAN_DIRECT_OUTPUT 1) #set version of .so diff --git a/src/vnode/CMakeLists.txt b/src/vnode/CMakeLists.txt index 8549fa478c..4631c4046b 100644 --- a/src/vnode/CMakeLists.txt +++ b/src/vnode/CMakeLists.txt @@ -1,7 +1,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) PROJECT(TDengine) -ADD_SUBDIRECTORY(common) +# ADD_SUBDIRECTORY(common) ADD_SUBDIRECTORY(tsdb) # ENABLE_TESTING() # ADD_SUBDIRECTORY(tests) -- GitLab