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

refact: rename taos lib name

This commit is contained in:
Shengliang Guan 2024-11-22 15:33:55 +08:00
parent 6186efeca1
commit 2d13ce5105
11 changed files with 54 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/cmake.define
View File

@ -97,10 +97,13 @@ ELSE()
SET(TD_TAOS_TOOLS TRUE)
ENDIF()
SET(TAOS_LIB taos)
SET(TAOS_LIB_STATIC taos_static)
IF(${TD_WINDOWS})
SET(TAOS_LIB taos_static)
SET(TAOS_LIB_LINK taos_static)
ELSE()
SET(TAOS_LIB taos)
SET(TAOS_LIB_LINK taos)
ENDIF()
# build TSZ by default

22
source/client/CMakeLists.txt
View File

@ -5,24 +5,24 @@ if(TD_ENTERPRISE)
endif()
if(TD_WINDOWS)
add_library(taos SHARED ${CLIENT_SRC} ${CMAKE_CURRENT_SOURCE_DIR}/src/taos.rc.in)
add_library(${TAOS_LIB} SHARED ${CLIENT_SRC} ${CMAKE_CURRENT_SOURCE_DIR}/src/taos.rc.in)
else()
add_library(taos SHARED ${CLIENT_SRC})
add_library(${TAOS_LIB} SHARED ${CLIENT_SRC})
endif()
if(${TD_DARWIN})
target_compile_options(taos PRIVATE -Wno-error=deprecated-non-prototype)
target_compile_options(${TAOS_LIB} PRIVATE -Wno-error=deprecated-non-prototype)
endif()
INCLUDE_DIRECTORIES(jni)
target_include_directories(
taos
${TAOS_LIB}
PUBLIC "${TD_SOURCE_DIR}/include/client"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
)
target_link_libraries(
taos
${TAOS_LIB}
INTERFACE api
PRIVATE os util common transport monitor nodes parser command planner catalog scheduler function qcom geometry
)
@ -36,32 +36,32 @@ else()
endif()
set_target_properties(
taos
${TAOS_LIB}
PROPERTIES
CLEAN_DIRECT_OUTPUT
1
)
set_target_properties(
taos
${TAOS_LIB}
PROPERTIES
VERSION ${TD_VER_NUMBER}
SOVERSION 1
)
add_library(taos_static STATIC ${CLIENT_SRC})
add_library(${TAOS_LIB_STATIC} STATIC ${CLIENT_SRC})
if(${TD_DARWIN})
target_compile_options(taos_static PRIVATE -Wno-error=deprecated-non-prototype)
target_compile_options(${TAOS_LIB_STATIC} PRIVATE -Wno-error=deprecated-non-prototype)
endif()
target_include_directories(
taos_static
${TAOS_LIB_STATIC}
PUBLIC "${TD_SOURCE_DIR}/include/client"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
)
target_link_libraries(
taos_static
${TAOS_LIB_STATIC}
INTERFACE api
PRIVATE os util common transport monitor nodes parser command planner catalog scheduler function qcom geometry
)

10
source/client/test/CMakeLists.txt
View File

@ -8,31 +8,31 @@ AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
ADD_EXECUTABLE(clientTest clientTests.cpp)
TARGET_LINK_LIBRARIES(
clientTest
os util common transport parser catalog scheduler gtest taos_static qcom executor function
os util common transport parser catalog scheduler gtest ${TAOS_LIB_LINK} qcom executor function
)
ADD_EXECUTABLE(tmqTest tmqTest.cpp)
TARGET_LINK_LIBRARIES(
tmqTest
PUBLIC os util common transport parser catalog scheduler function gtest taos_static qcom
PUBLIC os util common transport parser catalog scheduler function gtest ${TAOS_LIB_LINK} qcom
)
ADD_EXECUTABLE(smlTest smlTest.cpp)
TARGET_LINK_LIBRARIES(
smlTest
PUBLIC os util common transport parser catalog scheduler function gtest taos_static qcom geometry
PUBLIC os util common transport parser catalog scheduler function gtest ${TAOS_LIB_LINK} qcom geometry
)
#ADD_EXECUTABLE(clientMonitorTest clientMonitorTests.cpp)
#TARGET_LINK_LIBRARIES(
# clientMonitorTest
# PUBLIC os util common transport monitor parser catalog scheduler function gtest taos_static qcom executor
# PUBLIC os util common transport monitor parser catalog scheduler function gtest ${TAOS_LIB_LINK} qcom executor
#)
ADD_EXECUTABLE(userOperTest ../../../tests/script/api/passwdTest.c)
TARGET_LINK_LIBRARIES(
userOperTest
PUBLIC taos
PUBLIC ${TAOS_LIB_LINK}
)
TARGET_INCLUDE_DIRECTORIES(

2
source/dnode/mgmt/node_util/CMakeLists.txt
View File

@ -6,5 +6,5 @@ target_include_directories(
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inc"
)
target_link_libraries(
node_util cjson mnode vnode qnode snode wal sync taos_static tfs monitor monitorfw
node_util cjson mnode vnode qnode snode wal sync ${TAOS_LIB_STATIC} tfs monitor monitorfw
)

2
source/libs/catalog/test/CMakeLists.txt
View File

@ -9,7 +9,7 @@ IF(NOT TD_DARWIN)
ADD_EXECUTABLE(catalogTest ${SOURCE_LIST})
TARGET_LINK_LIBRARIES(
catalogTest
PUBLIC os util common nodes catalog transport gtest qcom taos_static
PUBLIC os util common nodes catalog transport gtest qcom ${TAOS_LIB_LINK}
)
TARGET_INCLUDE_DIRECTORIES(

2
source/libs/executor/test/CMakeLists.txt
View File

@ -9,7 +9,7 @@ MESSAGE(STATUS "build parser unit test")
# ADD_EXECUTABLE(executorTest ${SOURCE_LIST})
# TARGET_LINK_LIBRARIES(
# executorTest
# PRIVATE os util common transport gtest taos_static qcom executor function planner scalar nodes vnode
# PRIVATE os util common transport gtest ${TAOS_LIB_LINK} qcom executor function planner scalar nodes vnode
# )
#
# TARGET_INCLUDE_DIRECTORIES(

4
source/libs/scheduler/test/CMakeLists.txt
View File

@ -11,12 +11,12 @@ IF(NOT TD_DARWIN)
IF (TD_GRANT)
TARGET_LINK_LIBRARIES(
schedulerTest
PUBLIC os util common catalog transport gtest qcom taos_static planner scheduler grant
PUBLIC os util common catalog transport gtest qcom ${TAOS_LIB_LINK} planner scheduler grant
)
ELSE ()
TARGET_LINK_LIBRARIES(
schedulerTest
PUBLIC os util common catalog transport gtest qcom taos_static planner scheduler
PUBLIC os util common catalog transport gtest qcom ${TAOS_LIB_LINK} planner scheduler
)
ENDIF()

2
tests/taosc_test/CMakeLists.txt
View File

@ -16,7 +16,7 @@ aux_source_directory(src OS_SRC)
# taoscTest
add_executable(taoscTest "taoscTest.cpp")
target_link_libraries(taoscTest taos os gtest_main)
target_link_libraries(taoscTest ${TAOS_LIB_LINK} os gtest_main)
target_include_directories(
taoscTest
PUBLIC "${TD_SOURCE_DIR}/include/os"

12
tools/CMakeLists.txt
View File

@ -13,7 +13,7 @@ IF(TD_WEBSOCKET)
PREFIX "taosws-rs"
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
BUILD_ALWAYS off
DEPENDS taos
DEPENDS ${TAOS_LIB}
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config"
PATCH_COMMAND
@ -32,7 +32,7 @@ IF(TD_WEBSOCKET)
PREFIX "taosws-rs"
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
BUILD_ALWAYS off
DEPENDS taos
DEPENDS ${TAOS_LIB}
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config"
PATCH_COMMAND
@ -52,7 +52,7 @@ IF(TD_WEBSOCKET)
PREFIX "taosws-rs"
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
BUILD_ALWAYS off
DEPENDS taos
DEPENDS ${TAOS_LIB}
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config"
PATCH_COMMAND
@ -139,7 +139,7 @@ ELSE()
PREFIX "taosadapter"
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
BUILD_ALWAYS off
DEPENDS taos
DEPENDS ${TAOS_LIB}
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config"
PATCH_COMMAND
@ -168,7 +168,7 @@ ELSE()
PREFIX "taosadapter"
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
BUILD_ALWAYS off
DEPENDS taos
DEPENDS ${TAOS_LIB}
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config"
PATCH_COMMAND
@ -193,7 +193,7 @@ ELSE()
PREFIX "taosadapter"
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
BUILD_ALWAYS off
DEPENDS taos
DEPENDS ${TAOS_LIB}
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config"
PATCH_COMMAND

6
tools/shell/CMakeLists.txt
View File

@ -33,9 +33,9 @@ ELSE()
ENDIF()
if(TD_WINDOWS)
target_link_libraries(shell PUBLIC taos_static ${LINK_WEBSOCKET})
target_link_libraries(shell PUBLIC ${TAOS_LIB_STATIC} ${LINK_WEBSOCKET})
else()
target_link_libraries(shell PUBLIC taos ${LINK_WEBSOCKET} ${LINK_JEMALLOC} ${LINK_ARGP})
target_link_libraries(shell PUBLIC ${TAOS_LIB} ${LINK_WEBSOCKET} ${LINK_JEMALLOC} ${LINK_ARGP})
endif()
target_link_libraries(
@ -63,7 +63,7 @@ IF(TD_LINUX)
IF(TD_WEBSOCKET)
ADD_DEPENDENCIES(shell_ut taosws-rs)
ENDIF()
target_link_libraries(shell_ut PUBLIC taos ${LINK_WEBSOCKET} ${LINK_JEMALLOC} ${LINK_ARGP})
target_link_libraries(shell_ut PUBLIC ${TAOS_LIB} ${LINK_WEBSOCKET} ${LINK_JEMALLOC} ${LINK_ARGP})
target_link_libraries(shell_ut PRIVATE os common transport geometry util)
# util depends

36
utils/test/c/CMakeLists.txt
View File

@ -1,5 +1,5 @@
add_executable(tmq_demo tmqDemo.c)
add_dependencies(tmq_demo taos)
add_dependencies(tmq_demo ${TAOS_LIB_LINK})
add_executable(tmq_sim tmqSim.c)
add_executable(create_table createTable.c)
add_executable(tmq_taosx_ci tmq_taosx_ci.c)
@ -22,7 +22,7 @@ endif(${TD_LINUX})
target_link_libraries(
tmq_offset
PUBLIC taos
PUBLIC ${TAOS_LIB_LINK}
PUBLIC util
PUBLIC common
PUBLIC os
@ -30,7 +30,7 @@ target_link_libraries(
target_link_libraries(
tmq_multi_thread_test
PUBLIC taos
PUBLIC ${TAOS_LIB_LINK}
PUBLIC util
PUBLIC common
PUBLIC os
@ -38,56 +38,56 @@ target_link_libraries(
target_link_libraries(
create_table
PUBLIC taos
PUBLIC ${TAOS_LIB_LINK}
PUBLIC util
PUBLIC common
PUBLIC os
)
target_link_libraries(
tmq_demo
PUBLIC taos
PUBLIC ${TAOS_LIB_LINK}
PUBLIC util
PUBLIC common
PUBLIC os
)
target_link_libraries(
tmq_sim
PUBLIC ${TAOS_LIB}
PUBLIC ${TAOS_LIB_LINK}
PUBLIC util
PUBLIC common
PUBLIC os
)
target_link_libraries(
tmq_ts5466
PUBLIC taos
PUBLIC ${TAOS_LIB_LINK}
PUBLIC util
PUBLIC common
PUBLIC os
)
target_link_libraries(
tmq_td32187
PUBLIC taos
PUBLIC ${TAOS_LIB_LINK}
PUBLIC util
PUBLIC common
PUBLIC os
)
target_link_libraries(
tmq_td32526
PUBLIC taos
PUBLIC ${TAOS_LIB_LINK}
PUBLIC util
PUBLIC common
PUBLIC os
)
target_link_libraries(
tmq_taosx_ci
PUBLIC taos
PUBLIC ${TAOS_LIB_LINK}
PUBLIC util
PUBLIC common
PUBLIC os
)
target_link_libraries(
tmq_offset_test
PUBLIC taos
PUBLIC ${TAOS_LIB_LINK}
PUBLIC util
PUBLIC common
PUBLIC os
@ -95,7 +95,7 @@ target_link_libraries(
target_link_libraries(
replay_test
PUBLIC taos
PUBLIC ${TAOS_LIB_LINK}
PUBLIC util
PUBLIC common
PUBLIC os
@ -103,7 +103,7 @@ target_link_libraries(
target_link_libraries(
write_raw_block_test
PUBLIC taos
PUBLIC ${TAOS_LIB_LINK}
PUBLIC util
PUBLIC common
PUBLIC os
@ -111,7 +111,7 @@ target_link_libraries(
target_link_libraries(
tmq_write_raw_test
PUBLIC taos
PUBLIC ${TAOS_LIB_LINK}
PUBLIC util
PUBLIC common
PUBLIC os
@ -119,7 +119,7 @@ target_link_libraries(
target_link_libraries(
sml_test
PUBLIC taos
PUBLIC ${TAOS_LIB_LINK}
PUBLIC util
PUBLIC common
PUBLIC os
@ -128,7 +128,7 @@ target_link_libraries(
target_link_libraries(
get_db_name_test
PUBLIC taos
PUBLIC ${TAOS_LIB_LINK}
PUBLIC util
PUBLIC common
PUBLIC os
@ -136,7 +136,7 @@ target_link_libraries(
target_link_libraries(
varbinary_test
PUBLIC taos
PUBLIC ${TAOS_LIB_LINK}
PUBLIC util
PUBLIC common
PUBLIC os
@ -145,7 +145,7 @@ target_link_libraries(
if(${TD_LINUX})
target_link_libraries(
tsz_test
PUBLIC taos
PUBLIC ${TAOS_LIB_LINK}
PUBLIC util
PUBLIC common
PUBLIC os