Merge pull request #10622 from taosdata/feature/config

minor changes
2022-03-08 14:43:42 +08:00 · 2022-03-08 14:43:42 +08:00 · 5382552870
parent c3119245fb 18a22e6517
commit 5382552870
4 changed files with 2 additions and 3 deletions
--- a/source/libs/monitor/CMakeLists.txt
+++ b/source/libs/monitor/CMakeLists.txt
@ -3,7 +3,6 @@ add_library(monitor STATIC ${MONITOR_SRC})
 target_include_directories(
  monitor
  PUBLIC "${CMAKE_SOURCE_DIR}/include/libs/monitor"
-  PUBLIC "${CMAKE_SOURCE_DIR}/include/libs/transport"
  PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )

--- a/source/libs/monitor/inc/monInt.h
+++ b/source/libs/monitor/inc/monInt.h
@ -19,7 +19,6 @@
 #include "monitor.h"

 #include "tarray.h"
-#include "tlockfree.h"
 #include "tjson.h"

 typedef struct {
--- a/source/libs/transport/CMakeLists.txt
+++ b/source/libs/transport/CMakeLists.txt
@ -12,6 +12,7 @@ target_link_libraries(
    PUBLIC os
    PUBLIC util
    PUBLIC common
+    PUBLIC zlib
 )
 if (${BUILD_WITH_UV_TRANS}) 
 if (${BUILD_WITH_UV})
--- a/source/util/CMakeLists.txt
+++ b/source/util/CMakeLists.txt
@ -10,7 +10,7 @@ target_link_libraries(
    util
    PRIVATE os
    PUBLIC lz4_static
-    PUBLIC api cjson zlib
+    PUBLIC api cjson
 )

 if(${BUILD_TEST})