xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

other: merge 3.0

This commit is contained in:
Haojun Liao 2022-07-25 11:22:31 +08:00
parent 6d86ef0c33
commit f60bd675d1
2 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
source/libs/transport/src/.transSvr.c.swo Normal file
View File

Binary file not shown.

80
tools/CMakeLists.txt
View File

@ -1,46 +1,44 @@
IF (TD_WEBSOCKET) IF (TD_WEBSOCKET)
MESSAGE("${Green} use libtaos-ws${ColourReset}") 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")
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)
include(ExternalProject) ExternalProject_Add(taosws-rs
ExternalProject_Add(taosws-rs PREFIX "taosws-rs"
PREFIX "taosws-rs" SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs BUILD_ALWAYS off
BUILD_ALWAYS off DEPENDS taos
DEPENDS taos BUILD_IN_SOURCE 1
BUILD_IN_SOURCE 1 CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config"
CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config" PATCH_COMMAND
PATCH_COMMAND COMMAND git clean -f -d
COMMAND git clean -f -d BUILD_COMMAND
BUILD_COMMAND COMMAND cargo build --release -p taos-ws-sys
COMMAND cargo build --release -p taos-ws-sys COMMAND ./taos-ws-sys/ci/package.sh
COMMAND ./taos-ws-sys/ci/package.sh INSTALL_COMMAND
INSTALL_COMMAND COMMAND cmake -E copy target/libtaosws/libtaosws.so ${CMAKE_BINARY_DIR}/build/lib
COMMAND cmake -E copy target/libtaosws/libtaosws.so ${CMAKE_BINARY_DIR}/build/lib COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include COMMAND cmake -E copy target/libtaosws/taosws.h ${CMAKE_BINARY_DIR}/build/include
COMMAND cmake -E copy target/libtaosws/taosws.h ${CMAKE_BINARY_DIR}/build/include )
) ELSE()
ELSE() include(ExternalProject)
include(ExternalProject) ExternalProject_Add(taosws-rs
ExternalProject_Add(taosws-rs PREFIX "taosws-rs"
PREFIX "taosws-rs" SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs BUILD_ALWAYS on
BUILD_ALWAYS on DEPENDS taos
DEPENDS taos BUILD_IN_SOURCE 1
BUILD_IN_SOURCE 1 CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config"
CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config" PATCH_COMMAND
PATCH_COMMAND COMMAND git clean -f -d
COMMAND git clean -f -d BUILD_COMMAND
BUILD_COMMAND COMMAND cargo build --release -p taos-ws-sys
COMMAND cargo build --release -p taos-ws-sys COMMAND ./taos-ws-sys/ci/package.sh
COMMAND ./taos-ws-sys/ci/package.sh INSTALL_COMMAND
INSTALL_COMMAND COMMAND cmake -E copy target/libtaosws/libtaosws.so ${CMAKE_BINARY_DIR}/build/lib
COMMAND cmake -E copy target/libtaosws/libtaosws.so ${CMAKE_BINARY_DIR}/build/lib COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include COMMAND cmake -E copy target/libtaosws/taosws.h ${CMAKE_BINARY_DIR}/build/include
COMMAND cmake -E copy target/libtaosws/taosws.h ${CMAKE_BINARY_DIR}/build/include )
) ENDIF ()
ENDIF ()
ENDIF()
ENDIF () ENDIF ()
IF (TD_TAOS_TOOLS) IF (TD_TAOS_TOOLS)