From 212c34d2dd71b34e8602ed2e29e84ce789cc358b Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Thu, 1 Sep 2022 22:31:48 +0800 Subject: [PATCH] feat: prepare for 3.0 (#360) * feat: taos-tools for 3.0 cleanup cmake * fix: is_ds() in src/benchUtil.c * fix: cmake project name to dep logic --- src/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b7e259715..40cd06273 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -196,7 +196,9 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin INCLUDE_DIRECTORIES(/usr/local/include/) SET(WEBSOCKET_LINK_FLAGS "-ltaosws") - IF (${CMAKE_PROJECT_NAME} STREQUAL "TDengine") + IF (${CMAKE_PROJECT_NAME} STREQUAL "taos-tools") + MESSAGE("libtaosws.so need to be installed first") + ELSE () ADD_DEPENDENCIES(taosBenchmark taosws-rs) ADD_DEPENDENCIES(taosdump taosws-rs) ENDIF () @@ -322,7 +324,9 @@ ELSE () IF (${WEBSOCKET}) INCLUDE_DIRECTORIES(/usr/local/include/) SET(WEBSOCKET_LINK_FLAGS "-ltaosws") - IF (${CMAKE_PROJECT_NAME} STREQUAL "TDengine") + IF (${CMAKE_PROJECT_NAME} STREQUAL "taos-tools") + MESSAGE("libtaosws.so need to be installed first") + ELSE () ADD_DEPENDENCIES(taosBenchmark taosws-rs) #ADD_DEPENDENCIES(taosdump taosws-rs) ENDIF ()