other:merge 3.0

CMakeSettings.json

@@ -1,25 +0,0 @@
-{
-  "configurations": [
-    {
-      "name": "WSL-GCC-Debug",
-      "generator": "Unix Makefiles",
-      "configurationType": "Debug",
-      "buildRoot": "${projectDir}\\build\\",
-      "installRoot": "${projectDir}\\build\\",
-      "cmakeExecutable": "/usr/bin/cmake",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "",
-      "ctestCommandArgs": "",
-      "inheritEnvironments": [ "linux_x64" ],
-      "wslPath": "${defaultWSLPath}",
-      "addressSanitizerRuntimeFlags": "detect_leaks=0",
-      "variables": [
-        {
-          "name": "CMAKE_INSTALL_PREFIX",
-          "value": "/mnt/d/TDengine/TDengine/build",
-          "type": "PATH"
-        }
-      ]
-    }
-  ]
-}

examples/c/CMakeLists.txt

@@ -13,15 +13,9 @@ IF (TD_LINUX)
   #TARGET_LINK_LIBRARIES(epoll taos_static trpc tutil pthread lua)
 
   add_executable(tmq "")
-  add_executable(tmq_taosx "")
   add_executable(stream_demo "")
   add_executable(demoapi "")
 
-  target_sources(tmq_taosx
-      PRIVATE
-      "tmq_taosx.c"
-      )
-
   target_sources(tmq
       PRIVATE
       "tmq.c"
@@ -41,10 +35,6 @@ IF (TD_LINUX)
       taos_static
       )
 
-  target_link_libraries(tmq_taosx
-      taos_static
-      )
-
   target_link_libraries(stream_demo
       taos_static
       )
@@ -57,10 +47,6 @@ IF (TD_LINUX)
       PUBLIC "${TD_SOURCE_DIR}/include/os"
       PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
       )
-  target_include_directories(tmq_taosx
-      PUBLIC "${TD_SOURCE_DIR}/include/os"
-      PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
-      )
 
   target_include_directories(stream_demo
       PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
@@ -73,7 +59,6 @@ IF (TD_LINUX)
       )
 
   SET_TARGET_PROPERTIES(tmq PROPERTIES OUTPUT_NAME tmq)
-  SET_TARGET_PROPERTIES(tmq_taosx PROPERTIES OUTPUT_NAME tmq_taosx)
   SET_TARGET_PROPERTIES(stream_demo PROPERTIES OUTPUT_NAME stream_demo)
   SET_TARGET_PROPERTIES(demoapi PROPERTIES OUTPUT_NAME demoapi)
 ENDIF ()