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

fix: complie errors

This commit is contained in:
Shengliang Guan 2024-11-22 22:19:42 +08:00
parent 6a2ab2fa83
commit 877dbd8e90
8 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/cmake.define
View File

@ -101,9 +101,9 @@ SET(TAOS_LIB taos)
SET(TAOS_LIB_STATIC taos_static) SET(TAOS_LIB_STATIC taos_static)
IF(${TD_WINDOWS}) IF(${TD_WINDOWS})
SET(TAOS_LIB_LINK taos_static) SET(TAOS_LIB_PLATFORM_SPEC taos_static)
ELSE() ELSE()
SET(TAOS_LIB_LINK taos) SET(TAOS_LIB_PLATFORM_SPEC taos)
ENDIF() ENDIF()
# build TSZ by default # build TSZ by default

12
examples/c/CMakeLists.txt
View File

@ -42,27 +42,27 @@ IF(TD_LINUX)
) )
target_link_libraries(tmq target_link_libraries(tmq
${TAOS_LIB_LINK} ${TAOS_LIB}
) )
target_link_libraries(stream_demo target_link_libraries(stream_demo
${TAOS_LIB_LINK} ${TAOS_LIB}
) )
target_link_libraries(schemaless target_link_libraries(schemaless
${TAOS_LIB_LINK} ${TAOS_LIB}
) )
target_link_libraries(prepare target_link_libraries(prepare
${TAOS_LIB_LINK} ${TAOS_LIB}
) )
target_link_libraries(demo target_link_libraries(demo
${TAOS_LIB_LINK} ${TAOS_LIB}
) )
target_link_libraries(asyncdemo target_link_libraries(asyncdemo
${TAOS_LIB_LINK} ${TAOS_LIB}
) )
SET_TARGET_PROPERTIES(tmq PROPERTIES OUTPUT_NAME tmq) SET_TARGET_PROPERTIES(tmq PROPERTIES OUTPUT_NAME tmq)

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) ADD_EXECUTABLE(clientTest clientTests.cpp)
TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES(
clientTest clientTest
os util common transport parser catalog scheduler gtest ${TAOS_LIB_LINK} qcom executor function os util common transport parser catalog scheduler gtest ${TAOS_LIB_STATIC} qcom executor function
) )
ADD_EXECUTABLE(tmqTest tmqTest.cpp) ADD_EXECUTABLE(tmqTest tmqTest.cpp)
TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES(
tmqTest tmqTest
PUBLIC os util common transport parser catalog scheduler function gtest ${TAOS_LIB_LINK} qcom PUBLIC os util common transport parser catalog scheduler function gtest ${TAOS_LIB_STATIC} qcom
) )
ADD_EXECUTABLE(smlTest smlTest.cpp) ADD_EXECUTABLE(smlTest smlTest.cpp)
TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES(
smlTest smlTest
PUBLIC os util common transport parser catalog scheduler function gtest ${TAOS_LIB_LINK} qcom geometry PUBLIC os util common transport parser catalog scheduler function gtest ${TAOS_LIB_STATIC} qcom geometry
) )
#ADD_EXECUTABLE(clientMonitorTest clientMonitorTests.cpp) #ADD_EXECUTABLE(clientMonitorTest clientMonitorTests.cpp)
#TARGET_LINK_LIBRARIES( #TARGET_LINK_LIBRARIES(
# clientMonitorTest # clientMonitorTest
# PUBLIC os util common transport monitor parser catalog scheduler function gtest ${TAOS_LIB_LINK} qcom executor # PUBLIC os util common transport monitor parser catalog scheduler function gtest ${TAOS_LIB_STATIC} qcom executor
#) #)
ADD_EXECUTABLE(userOperTest ../../../tests/script/api/passwdTest.c) ADD_EXECUTABLE(userOperTest ../../../tests/script/api/passwdTest.c)
TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES(
userOperTest userOperTest
PUBLIC os util common transport parser catalog scheduler function gtest ${TAOS_LIB_LINK} qcom geometry PUBLIC ${TAOS_LIB}
) )
TARGET_INCLUDE_DIRECTORIES( TARGET_INCLUDE_DIRECTORIES(

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

@ -9,7 +9,7 @@ IF(NOT TD_DARWIN)
ADD_EXECUTABLE(catalogTest ${SOURCE_LIST}) ADD_EXECUTABLE(catalogTest ${SOURCE_LIST})
TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES(
catalogTest catalogTest
PUBLIC os util common nodes catalog transport gtest qcom ${TAOS_LIB_LINK} PUBLIC os util common nodes catalog transport gtest qcom ${TAOS_LIB_STATIC}
) )
TARGET_INCLUDE_DIRECTORIES( 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}) # ADD_EXECUTABLE(executorTest ${SOURCE_LIST})
# TARGET_LINK_LIBRARIES( # TARGET_LINK_LIBRARIES(
# executorTest # executorTest
# PRIVATE os util common transport gtest ${TAOS_LIB_LINK} qcom executor function planner scalar nodes vnode # PRIVATE os util common transport gtest ${TAOS_LIB_STATIC} qcom executor function planner scalar nodes vnode
# ) # )
# #
# TARGET_INCLUDE_DIRECTORIES( # TARGET_INCLUDE_DIRECTORIES(

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

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

2
tests/taosc_test/CMakeLists.txt
View File

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

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

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