other: merge 3.0

f60bd675 · Haojun Liao · 6d86ef0c · f60bd675 · f60bd675
显示空白变更内容
内联并排

Showing with 39 addition and 41 deletion

source/libs/transport/src/.transSvr.c.swo source/libs/transport/src/.transSvr.c.swo +0 -0

tools/CMakeLists.txt tools/CMakeLists.txt +39 -41

未找到文件。
--- a/source/libs/transport/src/.transSvr.c.swo
+++ b/source/libs/transport/src/.transSvr.c.swo
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
 IF (TD_WEBSOCKET)
    MESSAGE("${Green} use libtaos-ws${ColourReset}")
-    IF (TD_LINUX)
    IF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs/target/release/libtaosws.so" OR "${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs/target/release/libtaosws.so" IS_NEWER_THAN "${CMAKE_SOURCE_DIR}/.git/modules/tools/taosws-rs/FETCH_HEAD")
        include(ExternalProject)
        ExternalProject_Add(taosws-rs
@@ -40,7 +39,6 @@ IF (TD_WEBSOCKET)
            COMMAND cmake -E copy target/libtaosws/taosws.h ${CMAKE_BINARY_DIR}/build/include
            )
    ENDIF ()
-    ENDIF()
 ENDIF ()

 IF (TD_TAOS_TOOLS)