Merge pull request #2835 from taosdata/hotfix/test

[dynamic link libtaos.so]

src/dnode/CMakeLists.txt

@@ -16,7 +16,8 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   AUX_SOURCE_DIRECTORY(src SRC)
 
   ADD_EXECUTABLE(taosd ${SRC})
-  TARGET_LINK_LIBRARIES(taosd mnode taos_static monitor http mqtt tsdb twal vnode cJson lz4 balance sync)
+#  TARGET_LINK_LIBRARIES(taosd mnode taos_static monitor http mqtt tsdb twal vnode cJson lz4 balance sync)
+  TARGET_LINK_LIBRARIES(taosd mnode taos monitor http mqtt tsdb twal vnode cJson lz4 balance sync)
 
   IF (TD_ACCOUNT)
     TARGET_LINK_LIBRARIES(taosd account)

src/kit/shell/CMakeLists.txt

@@ -15,11 +15,11 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   LIST(REMOVE_ITEM SRC ./src/shellDarwin.c)
   ADD_EXECUTABLE(shell ${SRC})  
   
-  IF (TD_PAGMODE_LITE)
+#  IF (TD_PAGMODE_LITE)
     TARGET_LINK_LIBRARIES(shell taos)
-  ELSE ()
-    TARGET_LINK_LIBRARIES(shell taos_static)
-  ENDIF ()
+#  ELSE ()
+#    TARGET_LINK_LIBRARIES(shell taos_static)
+#  ENDIF ()
   
   SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
 ELSEIF (TD_WINDOWS_64)

src/kit/taosdemo/CMakeLists.txt

@@ -11,10 +11,10 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   AUX_SOURCE_DIRECTORY(. SRC)
   ADD_EXECUTABLE(taosdemo ${SRC})
   
-  IF (TD_PAGMODE_LITE)
+#  IF (TD_PAGMODE_LITE)
     TARGET_LINK_LIBRARIES(taosdemo taos)
-  ELSE ()
-    TARGET_LINK_LIBRARIES(taosdemo taos_static)
-  ENDIF ()
+#  ELSE ()
+#    TARGET_LINK_LIBRARIES(taosdemo taos_static)
+#  ENDIF ()
   
 ENDIF ()

src/kit/taosdump/CMakeLists.txt

@@ -13,11 +13,11 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   AUX_SOURCE_DIRECTORY(. SRC)
   ADD_EXECUTABLE(taosdump ${SRC})
   
-  IF (TD_PAGMODE_LITE)
+#  IF (TD_PAGMODE_LITE)
     TARGET_LINK_LIBRARIES(taosdump taos)
-  ELSE ()
-    TARGET_LINK_LIBRARIES(taosdump taos_static)
-  ENDIF ()  
+#  ELSE ()
+#    TARGET_LINK_LIBRARIES(taosdump taos_static)
+#  ENDIF ()  
   
   
 ENDIF ()

src/plugins/http/CMakeLists.txt

@@ -14,7 +14,8 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(inc)
   AUX_SOURCE_DIRECTORY(src SRC)
   ADD_LIBRARY(http ${SRC})
-  TARGET_LINK_LIBRARIES(http taos_static z)
+#  TARGET_LINK_LIBRARIES(http taos_static z)
+  TARGET_LINK_LIBRARIES(http taos z)
 
   IF (TD_ADMIN)
     TARGET_LINK_LIBRARIES(http admin)

src/plugins/monitor/CMakeLists.txt

@@ -11,5 +11,6 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(inc)
   AUX_SOURCE_DIRECTORY(./src SRC)
   ADD_LIBRARY(monitor ${SRC})
-  TARGET_LINK_LIBRARIES(monitor taos_static)
+#  TARGET_LINK_LIBRARIES(monitor taos_static)
+  TARGET_LINK_LIBRARIES(monitor taos)
 ENDIF ()  

src/plugins/mqtt/CMakeLists.txt

@@ -14,7 +14,8 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(inc)
   AUX_SOURCE_DIRECTORY(src SRC)
   ADD_LIBRARY(mqtt ${SRC})
-  TARGET_LINK_LIBRARIES(mqtt taos_static cJson mqttc)
+#  TARGET_LINK_LIBRARIES(mqtt taos_static cJson mqttc)
+  TARGET_LINK_LIBRARIES(mqtt taos cJson mqttc)
 
   IF (TD_ADMIN)
     TARGET_LINK_LIBRARIES(mqtt admin cJson)