From baa789c54dbfca87b474582de4864f2000a985e6 Mon Sep 17 00:00:00 2001 From: Simon Guan Date: Mon, 3 Mar 2025 15:00:34 +0800 Subject: [PATCH 1/9] refactor: do not compile test-related files when BUILD_TEST=OFF --- CMakeLists.txt | 3 ++- utils/CMakeLists.txt | 1 - utils/test/c/CMakeLists.txt | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db5b89db3d..960301075a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,12 +33,13 @@ target_include_directories(api INTERFACE "include/client") if(${BUILD_TEST}) include(CTest) enable_testing() + add_subdirectory(examples/c) + add_subdirectory(utils/tests/c) endif(${BUILD_TEST}) add_subdirectory(source) add_subdirectory(tools) add_subdirectory(utils) -add_subdirectory(examples/c) add_subdirectory(tests) include(${TD_SUPPORT_DIR}/cmake.install) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 9872a9dc55..dae610ff69 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -1,6 +1,5 @@ # ADD_SUBDIRECTORY(examples/c) ADD_SUBDIRECTORY(tsim) -ADD_SUBDIRECTORY(test/c) # ADD_SUBDIRECTORY(comparisonTest/tdengine) IF(NOT "${TSZ_ENABLED}" MATCHES "false") diff --git a/utils/test/c/CMakeLists.txt b/utils/test/c/CMakeLists.txt index 1b2716b8e5..4629b6c8d1 100644 --- a/utils/test/c/CMakeLists.txt +++ b/utils/test/c/CMakeLists.txt @@ -1,5 +1,4 @@ add_executable(tmq_demo tmqDemo.c) -add_dependencies(tmq_demo ${TAOS_LIB}) add_executable(tmq_sim tmqSim.c) add_executable(create_table createTable.c) add_executable(tmq_taosx_ci tmq_taosx_ci.c) @@ -47,6 +46,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_demo PUBLIC ${TAOS_LIB} @@ -54,6 +54,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_sim PUBLIC ${TAOS_LIB_PLATFORM_SPEC} @@ -61,6 +62,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_ts5466 PUBLIC ${TAOS_LIB} @@ -68,6 +70,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_td32187 PUBLIC ${TAOS_LIB} @@ -75,6 +78,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_td32471 PUBLIC ${TAOS_LIB} @@ -82,6 +86,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_td33798 PUBLIC ${TAOS_LIB} @@ -89,6 +94,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_td32526 PUBLIC ${TAOS_LIB} @@ -96,6 +102,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_ts5776 PUBLIC ${TAOS_LIB} @@ -103,6 +110,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_taosx_ci PUBLIC ${TAOS_LIB} @@ -110,6 +118,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_offset_test PUBLIC ${TAOS_LIB} From 5db648038b9866aea6c390a23d599f45f5fe6b81 Mon Sep 17 00:00:00 2001 From: Simon Guan Date: Mon, 3 Mar 2025 15:00:34 +0800 Subject: [PATCH 2/9] refactor: do not compile test-related files when BUILD_TEST=OFF --- CMakeLists.txt | 3 ++- source/libs/function/CMakeLists.txt | 40 ++++++++++++++--------------- utils/CMakeLists.txt | 1 - utils/test/c/CMakeLists.txt | 11 +++++++- 4 files changed, 31 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db5b89db3d..ac07a6d1e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,12 +33,13 @@ target_include_directories(api INTERFACE "include/client") if(${BUILD_TEST}) include(CTest) enable_testing() + add_subdirectory(examples/c) + add_subdirectory(utils/test/c) endif(${BUILD_TEST}) add_subdirectory(source) add_subdirectory(tools) add_subdirectory(utils) -add_subdirectory(examples/c) add_subdirectory(tests) include(${TD_SUPPORT_DIR}/cmake.install) diff --git a/source/libs/function/CMakeLists.txt b/source/libs/function/CMakeLists.txt index fad0a749d5..4934ca94e8 100644 --- a/source/libs/function/CMakeLists.txt +++ b/source/libs/function/CMakeLists.txt @@ -41,28 +41,26 @@ target_link_libraries( PUBLIC uv_a ) -add_executable(runUdf test/runUdf.c) -target_include_directories( - runUdf - PUBLIC - "${TD_SOURCE_DIR}/include/libs/function" - "${TD_SOURCE_DIR}/contrib/libuv/include" - "${TD_SOURCE_DIR}/include/util" - "${TD_SOURCE_DIR}/include/common" - "${TD_SOURCE_DIR}/include/client" - "${TD_SOURCE_DIR}/include/os" - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" -) +if(${BUILD_TEST}) + add_executable(runUdf test/runUdf.c) + target_include_directories( + runUdf + PUBLIC + "${TD_SOURCE_DIR}/include/libs/function" + "${TD_SOURCE_DIR}/contrib/libuv/include" + "${TD_SOURCE_DIR}/include/util" + "${TD_SOURCE_DIR}/include/common" + "${TD_SOURCE_DIR}/include/client" + "${TD_SOURCE_DIR}/include/os" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" + ) -IF(TD_LINUX_64 AND JEMALLOC_ENABLED) - ADD_DEPENDENCIES(runUdf jemalloc) -ENDIF() - -target_link_libraries( - runUdf - PUBLIC uv_a - PRIVATE os util common nodes function ${LINK_JEMALLOC} -) + target_link_libraries( + runUdf + PUBLIC uv_a + PRIVATE os util common nodes function ${LINK_JEMALLOC} + ) +endif() add_library(udf1 STATIC MODULE test/udf1.c) target_include_directories( diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 9872a9dc55..dae610ff69 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -1,6 +1,5 @@ # ADD_SUBDIRECTORY(examples/c) ADD_SUBDIRECTORY(tsim) -ADD_SUBDIRECTORY(test/c) # ADD_SUBDIRECTORY(comparisonTest/tdengine) IF(NOT "${TSZ_ENABLED}" MATCHES "false") diff --git a/utils/test/c/CMakeLists.txt b/utils/test/c/CMakeLists.txt index 1b2716b8e5..4629b6c8d1 100644 --- a/utils/test/c/CMakeLists.txt +++ b/utils/test/c/CMakeLists.txt @@ -1,5 +1,4 @@ add_executable(tmq_demo tmqDemo.c) -add_dependencies(tmq_demo ${TAOS_LIB}) add_executable(tmq_sim tmqSim.c) add_executable(create_table createTable.c) add_executable(tmq_taosx_ci tmq_taosx_ci.c) @@ -47,6 +46,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_demo PUBLIC ${TAOS_LIB} @@ -54,6 +54,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_sim PUBLIC ${TAOS_LIB_PLATFORM_SPEC} @@ -61,6 +62,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_ts5466 PUBLIC ${TAOS_LIB} @@ -68,6 +70,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_td32187 PUBLIC ${TAOS_LIB} @@ -75,6 +78,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_td32471 PUBLIC ${TAOS_LIB} @@ -82,6 +86,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_td33798 PUBLIC ${TAOS_LIB} @@ -89,6 +94,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_td32526 PUBLIC ${TAOS_LIB} @@ -96,6 +102,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_ts5776 PUBLIC ${TAOS_LIB} @@ -103,6 +110,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_taosx_ci PUBLIC ${TAOS_LIB} @@ -110,6 +118,7 @@ target_link_libraries( PUBLIC common PUBLIC os ) + target_link_libraries( tmq_offset_test PUBLIC ${TAOS_LIB} From 4379882779b8d8306f1e47ed5c8ce02411b9a6be Mon Sep 17 00:00:00 2001 From: Simon Guan Date: Mon, 3 Mar 2025 16:26:47 +0800 Subject: [PATCH 3/9] refactor: do not compile udf tests files when BUILD_TEST=OFF --- source/libs/function/CMakeLists.txt | 172 ++--------------------- source/libs/function/test/CMakeLists.txt | 60 ++++++++ source/libs/function/test/runUdf.c | 3 - 3 files changed, 70 insertions(+), 165 deletions(-) create mode 100644 source/libs/function/test/CMakeLists.txt diff --git a/source/libs/function/CMakeLists.txt b/source/libs/function/CMakeLists.txt index 4934ca94e8..4e3c8dddab 100644 --- a/source/libs/function/CMakeLists.txt +++ b/source/libs/function/CMakeLists.txt @@ -1,11 +1,14 @@ aux_source_directory(src FUNCTION_SRC) aux_source_directory(src/detail FUNCTION_SRC_DETAIL) list(REMOVE_ITEM FUNCTION_SRC src/udfd.c) -IF(COMPILER_SUPPORT_AVX2) + +if(COMPILER_SUPPORT_AVX2) MESSAGE(STATUS "AVX2 instructions is ACTIVATED") set_source_files_properties(src/detail/tminmaxavx.c PROPERTIES COMPILE_FLAGS -mavx2) -ENDIF() +endif() + add_library(function STATIC ${FUNCTION_SRC} ${FUNCTION_SRC_DETAIL}) + target_include_directories( function PUBLIC @@ -17,17 +20,6 @@ target_include_directories( PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" ) -IF(TD_LINUX_64 AND JEMALLOC_ENABLED) - ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc) - SET(LINK_JEMALLOC "-L${CMAKE_BINARY_DIR}/build/lib -ljemalloc") -ELSE() - SET(LINK_JEMALLOC "") -ENDIF() - -IF(TD_LINUX_64 AND JEMALLOC_ENABLED) - ADD_DEPENDENCIES(function jemalloc) -ENDIF() - target_link_libraries( function PRIVATE os @@ -41,150 +33,6 @@ target_link_libraries( PUBLIC uv_a ) -if(${BUILD_TEST}) - add_executable(runUdf test/runUdf.c) - target_include_directories( - runUdf - PUBLIC - "${TD_SOURCE_DIR}/include/libs/function" - "${TD_SOURCE_DIR}/contrib/libuv/include" - "${TD_SOURCE_DIR}/include/util" - "${TD_SOURCE_DIR}/include/common" - "${TD_SOURCE_DIR}/include/client" - "${TD_SOURCE_DIR}/include/os" - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" - ) - - target_link_libraries( - runUdf - PUBLIC uv_a - PRIVATE os util common nodes function ${LINK_JEMALLOC} - ) -endif() - -add_library(udf1 STATIC MODULE test/udf1.c) -target_include_directories( - udf1 - PUBLIC - "${TD_SOURCE_DIR}/include/libs/function" - "${TD_SOURCE_DIR}/include/util" - "${TD_SOURCE_DIR}/include/common" - "${TD_SOURCE_DIR}/include/client" - "${TD_SOURCE_DIR}/include/os" - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" -) - -IF(TD_LINUX_64 AND JEMALLOC_ENABLED) - ADD_DEPENDENCIES(udf1 jemalloc) -ENDIF() - -target_link_libraries( - udf1 PUBLIC os ${LINK_JEMALLOC}) - -add_library(udf1_dup STATIC MODULE test/udf1_dup.c) -target_include_directories( - udf1_dup - PUBLIC - "${TD_SOURCE_DIR}/include/libs/function" - "${TD_SOURCE_DIR}/include/util" - "${TD_SOURCE_DIR}/include/common" - "${TD_SOURCE_DIR}/include/client" - "${TD_SOURCE_DIR}/include/os" - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" -) - -IF(TD_LINUX_64 AND JEMALLOC_ENABLED) - ADD_DEPENDENCIES(udf1_dup jemalloc) -ENDIF() - -target_link_libraries( - udf1_dup PUBLIC os ${LINK_JEMALLOC}) - -add_library(udf2 STATIC MODULE test/udf2.c) -target_include_directories( - udf2 - PUBLIC - "${TD_SOURCE_DIR}/include/libs/function" - "${TD_SOURCE_DIR}/include/util" - "${TD_SOURCE_DIR}/include/common" - "${TD_SOURCE_DIR}/include/client" - "${TD_SOURCE_DIR}/include/os" - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" -) - -IF(TD_LINUX_64 AND JEMALLOC_ENABLED) - ADD_DEPENDENCIES(udf2 jemalloc) -ENDIF() - -target_link_libraries( - udf2 PUBLIC os ${LINK_JEMALLOC} -) - -add_library(udf2_dup STATIC MODULE test/udf2_dup.c) -target_include_directories( - udf2_dup - PUBLIC - "${TD_SOURCE_DIR}/include/libs/function" - "${TD_SOURCE_DIR}/include/util" - "${TD_SOURCE_DIR}/include/common" - "${TD_SOURCE_DIR}/include/client" - "${TD_SOURCE_DIR}/include/os" - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" -) - -IF(TD_LINUX_64 AND JEMALLOC_ENABLED) - ADD_DEPENDENCIES(udf2_dup jemalloc) -ENDIF() - -target_link_libraries( - udf2_dup PUBLIC os ${LINK_JEMALLOC} -) - -set(TARGET_NAMES - change_udf_normal - change_udf_no_init - change_udf_no_process - change_udf_no_destroy - change_udf_init_failed - change_udf_process_failed - change_udf_destory_failed -) - -set(COMPILE_DEFINITIONS - CHANGE_UDF_NORMAL - CHANGE_UDF_NO_INIT - CHANGE_UDF_NO_PROCESS - CHANGE_UDF_NO_DESTROY - CHANGE_UDF_INIT_FAILED - CHANGE_UDF_PROCESS_FAILED - CHANGE_UDF_DESTORY_FAILED -) - -foreach(index RANGE 0 6) - list(GET TARGET_NAMES ${index} target_name) - list(GET COMPILE_DEFINITIONS ${index} compile_def) - - add_library(${target_name} STATIC MODULE test/change_udf.c) - target_include_directories( - ${target_name} - PUBLIC - "${TD_SOURCE_DIR}/include/libs/function" - "${TD_SOURCE_DIR}/include/util" - "${TD_SOURCE_DIR}/include/common" - "${TD_SOURCE_DIR}/include/client" - "${TD_SOURCE_DIR}/include/os" - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" - ) - target_compile_definitions(${target_name} PRIVATE ${compile_def}) - IF(TD_LINUX_64 AND JEMALLOC_ENABLED) - ADD_DEPENDENCIES(${target_name} jemalloc) - ENDIF() - target_link_libraries( - ${target_name} PUBLIC os ${LINK_JEMALLOC} - ) -endforeach() - -# SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/build/bin) add_executable(udfd src/udfd.c) if(${TD_DARWIN}) @@ -203,12 +51,12 @@ target_include_directories( PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" ) -IF(TD_LINUX_64 AND JEMALLOC_ENABLED) - ADD_DEPENDENCIES(udfd jemalloc) -ENDIF() - target_link_libraries( udfd PUBLIC uv_a - PRIVATE os util common nodes function ${LINK_JEMALLOC} + PRIVATE os util common nodes function ) + +if(${BUILD_TEST}) + add_subdirectory(test) +endif() diff --git a/source/libs/function/test/CMakeLists.txt b/source/libs/function/test/CMakeLists.txt new file mode 100644 index 0000000000..d805adff3a --- /dev/null +++ b/source/libs/function/test/CMakeLists.txt @@ -0,0 +1,60 @@ +set(TD_UDF_INC + "${TD_SOURCE_DIR}/include/libs/function" + "${TD_SOURCE_DIR}/contrib/libuv/include" + "${TD_SOURCE_DIR}/include/util" + "${TD_SOURCE_DIR}/include/common" + "${TD_SOURCE_DIR}/include/client" + "${TD_SOURCE_DIR}/include/os" + "${CMAKE_CURRENT_SOURCE_DIR}/../inc" +) + +set(TD_UDF_LIB uv_a PRIVATE os util common nodes function) + +add_executable(runUdf runUdf.c) +target_include_directories(runUdf PUBLIC ${TD_UDF_INC}) +target_link_libraries(runUdf PUBLIC ${TD_UDF_LIB}) + +add_library(udf1 STATIC MODULE udf1.c) +target_include_directories(udf1 PUBLIC ${TD_UDF_INC}) +target_link_libraries(udf1 PUBLIC os) + +add_library(udf2 STATIC MODULE udf2.c) +target_include_directories(udf2 PUBLIC ${TD_UDF_INC}) +target_link_libraries(udf2 PUBLIC os) + +add_library(udf1_dup STATIC MODULE udf1_dup.c) +target_include_directories(udf1_dup PUBLIC ${TD_UDF_INC}) +target_link_libraries(udf1_dup PUBLIC os) + +add_library(udf2_dup STATIC MODULE udf2_dup.c) +target_include_directories(udf2_dup PUBLIC ${TD_UDF_INC}) +target_link_libraries(udf2_dup PUBLIC os) + +set(TARGET_NAMES + change_udf_normal + change_udf_no_init + change_udf_no_process + change_udf_no_destroy + change_udf_init_failed + change_udf_process_failed + change_udf_destory_failed +) + +set(COMPILE_DEFINITIONS + CHANGE_UDF_NORMAL + CHANGE_UDF_NO_INIT + CHANGE_UDF_NO_PROCESS + CHANGE_UDF_NO_DESTROY + CHANGE_UDF_INIT_FAILED + CHANGE_UDF_PROCESS_FAILED + CHANGE_UDF_DESTORY_FAILED +) + +foreach(index RANGE 0 6) + list(GET TARGET_NAMES ${index} target_name) + list(GET COMPILE_DEFINITIONS ${index} compile_def) + add_library(${target_name} STATIC MODULE change_udf.c) + target_include_directories(${target_name} PUBLIC ${TD_UDF_INC}) + target_compile_definitions(${target_name} PRIVATE ${compile_def}) + target_link_libraries(${target_name} PUBLIC os) +endforeach() \ No newline at end of file diff --git a/source/libs/function/test/runUdf.c b/source/libs/function/test/runUdf.c index f28b44d1b8..0c47247e21 100644 --- a/source/libs/function/test/runUdf.c +++ b/source/libs/function/test/runUdf.c @@ -1,6 +1,3 @@ -#include -#include -#include #include "uv.h" #include "fnLog.h" From 68ba80362342ac70e9565815251403f1998d8602 Mon Sep 17 00:00:00 2001 From: Simon Guan Date: Mon, 3 Mar 2025 23:11:03 +0800 Subject: [PATCH 4/9] refactor: cmake files --- CMakeLists.txt | 26 +++++++++----------------- utils/CMakeLists.txt | 4 ++++ 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac07a6d1e3..2be056ec4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,37 +11,29 @@ if(NOT DEFINED TD_SOURCE_DIR) endif() SET(TD_COMMUNITY_DIR ${PROJECT_SOURCE_DIR}) - set(TD_SUPPORT_DIR "${TD_SOURCE_DIR}/cmake") set(TD_CONTRIB_DIR "${TD_SOURCE_DIR}/contrib") include(${TD_SUPPORT_DIR}/cmake.platform) -include(${TD_SUPPORT_DIR}/cmake.define) include(${TD_SUPPORT_DIR}/cmake.options) +include(${TD_SUPPORT_DIR}/cmake.define) include(${TD_SUPPORT_DIR}/cmake.version) - -# contrib -add_subdirectory(contrib) +include(${TD_SUPPORT_DIR}/cmake.install) set_property(GLOBAL PROPERTY GLOBAL_DEPENDS_NO_CYCLES OFF) -# api add_library(api INTERFACE) target_include_directories(api INTERFACE "include/client") -# src -if(${BUILD_TEST}) - include(CTest) - enable_testing() - add_subdirectory(examples/c) - add_subdirectory(utils/test/c) -endif(${BUILD_TEST}) - +add_subdirectory(contrib) add_subdirectory(source) add_subdirectory(tools) add_subdirectory(utils) add_subdirectory(tests) -include(${TD_SUPPORT_DIR}/cmake.install) - -# docs add_subdirectory(docs/doxgen) + +if(${BUILD_TEST}) + include(CTest) + enable_testing() + add_subdirectory(examples/c) +endif(${BUILD_TEST}) \ No newline at end of file diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index dae610ff69..a6377f15a8 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -1,6 +1,10 @@ # ADD_SUBDIRECTORY(examples/c) ADD_SUBDIRECTORY(tsim) +IF(${BUILD_TEST}) + ADD_SUBDIRECTORY(test) +ENDIF(${BUILD_TEST}) + # ADD_SUBDIRECTORY(comparisonTest/tdengine) IF(NOT "${TSZ_ENABLED}" MATCHES "false") ADD_SUBDIRECTORY(TSZ) From e23a657f5315b68fb4047c52809803848eb37312 Mon Sep 17 00:00:00 2001 From: Simon Guan Date: Tue, 4 Mar 2025 14:50:21 +0800 Subject: [PATCH 5/9] fix: ci errors --- tests/script/tsim/sync/3Replica1VgElect.sim | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/script/tsim/sync/3Replica1VgElect.sim b/tests/script/tsim/sync/3Replica1VgElect.sim index 6ebee885a8..1de856f9a4 100644 --- a/tests/script/tsim/sync/3Replica1VgElect.sim +++ b/tests/script/tsim/sync/3Replica1VgElect.sim @@ -91,19 +91,19 @@ endi if $data[0][4] == leader then if $data[0][7] == follower then if $data[0][10] == follower then - print ---- vgroup $data[0][0] leader locate on dnode $data[0][3] + print ---- vgroup $data[0][0] leader locate on dnode $data[0][4] endi endi -elif $data[0][6] == leader then - if $data[0][7] == follower then - if $data[0][10] == follower then - print ---- vgroup $data[0][0] leader locate on dnode $data[0][5] +elif $data[0][7] == leader then + if $data[0][10] == follower then + if $data[0][4] == follower then + print ---- vgroup $data[0][0] leader locate on dnode $data[0][7] endi endi elif $data[0][10] == leader then if $data[0][4] == follower then if $data[0][7] == follower then - print ---- vgroup $data[0][0] leader locate on dnode $data[0][7] + print ---- vgroup $data[0][0] leader locate on dnode $data[0][10] endi endi else From 0498d146a1fad5838f9f03d7c690efbc8c8ae839 Mon Sep 17 00:00:00 2001 From: Simon Guan Date: Tue, 4 Mar 2025 16:37:51 +0800 Subject: [PATCH 6/9] fix: ci errors --- utils/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index a6377f15a8..721da32bfc 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -2,7 +2,7 @@ ADD_SUBDIRECTORY(tsim) IF(${BUILD_TEST}) - ADD_SUBDIRECTORY(test) + ADD_SUBDIRECTORY(test/c) ENDIF(${BUILD_TEST}) # ADD_SUBDIRECTORY(comparisonTest/tdengine) From e321a3be12ad5d960f02a1b79323c7ee6dab1d55 Mon Sep 17 00:00:00 2001 From: Simon Guan Date: Thu, 6 Mar 2025 13:49:31 +0800 Subject: [PATCH 7/9] refactor: cmake files --- source/libs/function/test/runUdf.c | 5 +---- tests/script/tsim/sync/3Replica1VgElect.sim | 17 +++++++---------- utils/CMakeLists.txt | 5 ++++- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/source/libs/function/test/runUdf.c b/source/libs/function/test/runUdf.c index f28b44d1b8..39f547cc06 100644 --- a/source/libs/function/test/runUdf.c +++ b/source/libs/function/test/runUdf.c @@ -1,6 +1,3 @@ -#include -#include -#include #include "uv.h" #include "fnLog.h" @@ -218,4 +215,4 @@ int main(int argc, char *argv[]) { fnError("failed to close udfc"); return -1; } -} +} \ No newline at end of file diff --git a/tests/script/tsim/sync/3Replica1VgElect.sim b/tests/script/tsim/sync/3Replica1VgElect.sim index 6ebee885a8..353ec2c792 100644 --- a/tests/script/tsim/sync/3Replica1VgElect.sim +++ b/tests/script/tsim/sync/3Replica1VgElect.sim @@ -91,19 +91,19 @@ endi if $data[0][4] == leader then if $data[0][7] == follower then if $data[0][10] == follower then - print ---- vgroup $data[0][0] leader locate on dnode $data[0][3] + print ---- vgroup $data[0][0] leader locate on dnode $data[0][4] endi endi -elif $data[0][6] == leader then - if $data[0][7] == follower then - if $data[0][10] == follower then - print ---- vgroup $data[0][0] leader locate on dnode $data[0][5] +elif $data[0][7] == leader then + if $data[0][10] == follower then + if $data[0][4] == follower then + print ---- vgroup $data[0][0] leader locate on dnode $data[0][7] endi endi elif $data[0][10] == leader then if $data[0][4] == follower then if $data[0][7] == follower then - print ---- vgroup $data[0][0] leader locate on dnode $data[0][7] + print ---- vgroup $data[0][0] leader locate on dnode $data[0][10] endi endi else @@ -461,7 +461,4 @@ endi system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode2 -s stop -x SIGINT system sh/exec.sh -n dnode3 -s stop -x SIGINT -system sh/exec.sh -n dnode4 -s stop -x SIGINT - - - +system sh/exec.sh -n dnode4 -s stop -x SIGINT \ No newline at end of file diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 9872a9dc55..721da32bfc 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -1,6 +1,9 @@ # ADD_SUBDIRECTORY(examples/c) ADD_SUBDIRECTORY(tsim) -ADD_SUBDIRECTORY(test/c) + +IF(${BUILD_TEST}) + ADD_SUBDIRECTORY(test/c) +ENDIF(${BUILD_TEST}) # ADD_SUBDIRECTORY(comparisonTest/tdengine) IF(NOT "${TSZ_ENABLED}" MATCHES "false") From 95116370b57cbb07e5b6d6c259f5e793a5396778 Mon Sep 17 00:00:00 2001 From: Simon Guan Date: Thu, 6 Mar 2025 16:45:46 +0800 Subject: [PATCH 8/9] refactor: minor changes --- README-CN.md | 6 +- README.md | 2 +- cmake/cmake.define | 5 +- source/libs/function/test/CMakeLists.txt | 91 +++++++++++++++++++----- tests/ci/container_build_newmachine.sh | 2 +- tests/parallel_test/container_build.sh | 6 +- 6 files changed, 84 insertions(+), 28 deletions(-) diff --git a/README-CN.md b/README-CN.md index 40e97de2ba..ad622b3896 100644 --- a/README-CN.md +++ b/README-CN.md @@ -162,10 +162,10 @@ make 可以使用Jemalloc作为内存分配器，而不是使用glibc: ```bash -cmake .. -DJEMALLOC_ENABLED=true +cmake .. -DJEMALLOC_ENABLED=ON ``` -TDengine构建脚本可以自动检测x86、x86-64、arm64平台上主机的体系结构。 -您也可以通过CPUTYPE选项手动指定架构: +TDengine构建脚本可以自动检测 x86、x86-64、arm64 平台上主机的体系结构。 +您也可以通过 CPUTYPE 选项手动指定架构: ```bash cmake .. -DCPUTYPE=aarch64 && cmake --build . diff --git a/README.md b/README.md index f7db2a7ea2..9bc6c5dd83 100644 --- a/README.md +++ b/README.md @@ -177,7 +177,7 @@ If you want to compile taosKeeper, you need to add the `--DBUILD_KEEPER=true` op You can use Jemalloc as memory allocator instead of glibc: ```bash -cmake .. -DJEMALLOC_ENABLED=true +cmake .. -DJEMALLOC_ENABLED=ON ``` TDengine build script can auto-detect the host machine's architecture on x86, x86-64, arm64 platform. diff --git a/cmake/cmake.define b/cmake/cmake.define index dae8020dcc..72c9e84f78 100644 --- a/cmake/cmake.define +++ b/cmake/cmake.define @@ -116,7 +116,6 @@ ELSE() set(VAR_TSZ "TSZ" CACHE INTERNAL "global variant tsz") ENDIF() -# force set all platform to JEMALLOC_ENABLED = false # SET(JEMALLOC_ENABLED OFF) IF(TD_WINDOWS) @@ -262,10 +261,10 @@ ENDIF() IF(TD_LINUX) IF(${JEMALLOC_ENABLED}) - MESSAGE(STATUS "JEMALLOC_ENABLED Enabled") + MESSAGE(STATUS "JEMALLOC Enabled") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=attributes") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=attributes") ELSE() - MESSAGE(STATUS "JEMALLOC_ENABLED Disabled") + MESSAGE(STATUS "JEMALLOC Disabled") ENDIF() ENDIF() \ No newline at end of file diff --git a/source/libs/function/test/CMakeLists.txt b/source/libs/function/test/CMakeLists.txt index d805adff3a..43107a952a 100644 --- a/source/libs/function/test/CMakeLists.txt +++ b/source/libs/function/test/CMakeLists.txt @@ -1,33 +1,78 @@ -set(TD_UDF_INC + + +add_executable(runUdf runUdf.c) +target_include_directories( + runUdf + PUBLIC "${TD_SOURCE_DIR}/include/libs/function" "${TD_SOURCE_DIR}/contrib/libuv/include" "${TD_SOURCE_DIR}/include/util" "${TD_SOURCE_DIR}/include/common" "${TD_SOURCE_DIR}/include/client" "${TD_SOURCE_DIR}/include/os" - "${CMAKE_CURRENT_SOURCE_DIR}/../inc" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" ) -set(TD_UDF_LIB uv_a PRIVATE os util common nodes function) - -add_executable(runUdf runUdf.c) -target_include_directories(runUdf PUBLIC ${TD_UDF_INC}) -target_link_libraries(runUdf PUBLIC ${TD_UDF_LIB}) +target_link_libraries( + runUdf + PUBLIC uv_a + PRIVATE os util common nodes function +) add_library(udf1 STATIC MODULE udf1.c) -target_include_directories(udf1 PUBLIC ${TD_UDF_INC}) +target_include_directories( + udf1 + PUBLIC + "${TD_SOURCE_DIR}/include/libs/function" + "${TD_SOURCE_DIR}/include/util" + "${TD_SOURCE_DIR}/include/common" + "${TD_SOURCE_DIR}/include/client" + "${TD_SOURCE_DIR}/include/os" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" +) + target_link_libraries(udf1 PUBLIC os) -add_library(udf2 STATIC MODULE udf2.c) -target_include_directories(udf2 PUBLIC ${TD_UDF_INC}) -target_link_libraries(udf2 PUBLIC os) - add_library(udf1_dup STATIC MODULE udf1_dup.c) -target_include_directories(udf1_dup PUBLIC ${TD_UDF_INC}) +target_include_directories( + udf1_dup + PUBLIC + "${TD_SOURCE_DIR}/include/libs/function" + "${TD_SOURCE_DIR}/include/util" + "${TD_SOURCE_DIR}/include/common" + "${TD_SOURCE_DIR}/include/client" + "${TD_SOURCE_DIR}/include/os" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" +) + target_link_libraries(udf1_dup PUBLIC os) +add_library(udf2 STATIC MODULE udf2.c) +target_include_directories( + udf2 + PUBLIC + "${TD_SOURCE_DIR}/include/libs/function" + "${TD_SOURCE_DIR}/include/util" + "${TD_SOURCE_DIR}/include/common" + "${TD_SOURCE_DIR}/include/client" + "${TD_SOURCE_DIR}/include/os" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" +) + +target_link_libraries(udf2 PUBLIC os) + add_library(udf2_dup STATIC MODULE udf2_dup.c) -target_include_directories(udf2_dup PUBLIC ${TD_UDF_INC}) +target_include_directories( + udf2_dup + PUBLIC + "${TD_SOURCE_DIR}/include/libs/function" + "${TD_SOURCE_DIR}/include/util" + "${TD_SOURCE_DIR}/include/common" + "${TD_SOURCE_DIR}/include/client" + "${TD_SOURCE_DIR}/include/os" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" +) + target_link_libraries(udf2_dup PUBLIC os) set(TARGET_NAMES @@ -53,8 +98,20 @@ set(COMPILE_DEFINITIONS foreach(index RANGE 0 6) list(GET TARGET_NAMES ${index} target_name) list(GET COMPILE_DEFINITIONS ${index} compile_def) + add_library(${target_name} STATIC MODULE change_udf.c) - target_include_directories(${target_name} PUBLIC ${TD_UDF_INC}) + target_include_directories( + ${target_name} + PUBLIC + "${TD_SOURCE_DIR}/include/libs/function" + "${TD_SOURCE_DIR}/include/util" + "${TD_SOURCE_DIR}/include/common" + "${TD_SOURCE_DIR}/include/client" + "${TD_SOURCE_DIR}/include/os" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" + ) target_compile_definitions(${target_name} PRIVATE ${compile_def}) - target_link_libraries(${target_name} PUBLIC os) -endforeach() \ No newline at end of file + target_link_libraries( + ${target_name} PUBLIC os + ) +endforeach() diff --git a/tests/ci/container_build_newmachine.sh b/tests/ci/container_build_newmachine.sh index 369429b99f..f0d69e6171 100755 --- a/tests/ci/container_build_newmachine.sh +++ b/tests/ci/container_build_newmachine.sh @@ -61,7 +61,7 @@ docker run \ -v /root/go/pkg/mod:/root/go/pkg/mod \ -v /root/.cache/go-build:/root/.cache/go-build \ -v /root/.cos-local.1:/root/.cos-local.2 \ - --rm --ulimit core=-1 taos_test:v1.0 sh -c "pip uninstall taospy -y;pip3 install taospy==2.7.2;cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true -DBUILD_SANITIZER=1 -DTOOLS_SANITIZE=true $CMAKE_BUILD_TYPE -DTOOLS_BUILD_TYPE=Debug -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=0;make -j 10|| exit 1 " + --rm --ulimit core=-1 taos_test:v1.0 sh -c "pip uninstall taospy -y; pip3 install taospy==2.7.2; cd $REP_DIR; rm -rf debug ;mkdir -p debug; cd debug; cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=ON -DWEBSOCKET=true -DBUILD_SANITIZER=1 -DTOOLS_SANITIZE=true $CMAKE_BUILD_TYPE -DTOOLS_BUILD_TYPE=Debug -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=OFF; make -j 10|| exit 1 " # -v ${REP_REAL_PATH}/community/contrib/jemalloc/:${REP_DIR}/community/contrib/jemalloc \ if [[ -d ${WORKDIR}/debugNoSan ]] ;then diff --git a/tests/parallel_test/container_build.sh b/tests/parallel_test/container_build.sh index abff489397..35388fc339 100755 --- a/tests/parallel_test/container_build.sh +++ b/tests/parallel_test/container_build.sh @@ -81,7 +81,7 @@ docker run \ -v ${REP_REAL_PATH}/community/contrib/pcre2/:${REP_DIR}/community/contrib/pcre2 \ -v ${REP_REAL_PATH}/community/contrib/zlib/:${REP_DIR}/community/contrib/zlib \ -v ${REP_REAL_PATH}/community/contrib/zstd/:${REP_DIR}/community/contrib/zstd \ - --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=0 -DCMAKE_EXPORT_COMPILE_COMMANDS=1 ;make -j|| exit 1" + --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR; rm -rf debug; mkdir -p debug; cd debug; cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=ON -DWEBSOCKET=true -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=1 ;make -j|| exit 1" # -v ${REP_REAL_PATH}/community/contrib/jemalloc/:${REP_DIR}/community/contrib/jemalloc \ if [[ -d ${WORKDIR}/debugNoSan ]] ;then @@ -133,7 +133,7 @@ docker run \ -v ${REP_REAL_PATH}/community/contrib/pcre2/:${REP_DIR}/community/contrib/pcre2 \ -v ${REP_REAL_PATH}/community/contrib/zlib/:${REP_DIR}/community/contrib/zlib \ -v ${REP_REAL_PATH}/community/contrib/zstd/:${REP_DIR}/community/contrib/zstd \ - --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=false -DWEBSOCKET=true -DBUILD_SANITIZER=1 -DTOOLS_SANITIZE=true -DCMAKE_BUILD_TYPE=Debug -DTOOLS_BUILD_TYPE=Debug -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=0;make -j|| exit 1 " + --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR; rm -rf debug; mkdir -p debug; cd debug; cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=ON -DWEBSOCKET=true -DBUILD_SANITIZER=1 -DTOOLS_SANITIZE=true -DCMAKE_BUILD_TYPE=Debug -DTOOLS_BUILD_TYPE=Debug -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=OFF; make -j|| exit 1 " mv ${REP_REAL_PATH}/debug ${WORKDIR}/debugSan @@ -168,7 +168,7 @@ date # -v ${REP_REAL_PATH}/community/contrib/xml2/:${REP_DIR}/community/contrib/xml2 \ # -v ${REP_REAL_PATH}/community/contrib/zlib/:${REP_DIR}/community/contrib/zlib \ # -v ${REP_REAL_PATH}/community/contrib/zstd/:${REP_DIR}/community/contrib/zstd \ -# --rm --ulimit core=-1 taos_test:v1.0 sh -c "pip uninstall taospy -y;pip3 install taospy==2.7.2;cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=false -DWEBSOCKET=true -DCMAKE_BUILD_TYPE=Release -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=0;make -j || exit 1 " +# --rm --ulimit core=-1 taos_test:v1.0 sh -c "pip uninstall taospy -y; pip3 install taospy==2.7.2; cd $REP_DIR; rm -rf debug; mkdir -p debug; cd debug; cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=ON -DWEBSOCKET=true -DCMAKE_BUILD_TYPE=Release -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=OFF; make -j || exit 1 " # mv ${REP_REAL_PATH}/debug ${WORKDIR}/debugRelease From 2a0584114d44799a749892a48d8f86630d20bd8d Mon Sep 17 00:00:00 2001 From: Simon Guan Date: Thu, 6 Mar 2025 17:01:50 +0800 Subject: [PATCH 9/9] fix: compile errors --- include/common/tcommon.h | 2 +- source/libs/function/test/CMakeLists.txt | 87 ++++-------------------- 2 files changed, 13 insertions(+), 76 deletions(-) diff --git a/include/common/tcommon.h b/include/common/tcommon.h index bd5bdb927d..45f3869b1b 100644 --- a/include/common/tcommon.h +++ b/include/common/tcommon.h @@ -124,7 +124,7 @@ enum { TMQ_MSG_TYPE__POLL_RAW_DATA_RSP, }; -static char* tmqMsgTypeStr[] = { +static const char* tmqMsgTypeStr[] = { "data", "meta", "ask ep", "meta data", "wal info", "batch meta", "raw data" }; diff --git a/source/libs/function/test/CMakeLists.txt b/source/libs/function/test/CMakeLists.txt index 43107a952a..aa350b12c2 100644 --- a/source/libs/function/test/CMakeLists.txt +++ b/source/libs/function/test/CMakeLists.txt @@ -1,18 +1,12 @@ - +include_directories("${TD_SOURCE_DIR}/include/libs/function") +include_directories("${TD_SOURCE_DIR}/contrib/libuv/include") +include_directories("${TD_SOURCE_DIR}/include/util") +include_directories("${TD_SOURCE_DIR}/include/common") +include_directories("${TD_SOURCE_DIR}/include/client") +include_directories("${TD_SOURCE_DIR}/include/os") +include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../inc") add_executable(runUdf runUdf.c) -target_include_directories( - runUdf - PUBLIC - "${TD_SOURCE_DIR}/include/libs/function" - "${TD_SOURCE_DIR}/contrib/libuv/include" - "${TD_SOURCE_DIR}/include/util" - "${TD_SOURCE_DIR}/include/common" - "${TD_SOURCE_DIR}/include/client" - "${TD_SOURCE_DIR}/include/os" - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" -) - target_link_libraries( runUdf PUBLIC uv_a @@ -20,59 +14,15 @@ target_link_libraries( ) add_library(udf1 STATIC MODULE udf1.c) -target_include_directories( - udf1 - PUBLIC - "${TD_SOURCE_DIR}/include/libs/function" - "${TD_SOURCE_DIR}/include/util" - "${TD_SOURCE_DIR}/include/common" - "${TD_SOURCE_DIR}/include/client" - "${TD_SOURCE_DIR}/include/os" - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" -) - target_link_libraries(udf1 PUBLIC os) -add_library(udf1_dup STATIC MODULE udf1_dup.c) -target_include_directories( - udf1_dup - PUBLIC - "${TD_SOURCE_DIR}/include/libs/function" - "${TD_SOURCE_DIR}/include/util" - "${TD_SOURCE_DIR}/include/common" - "${TD_SOURCE_DIR}/include/client" - "${TD_SOURCE_DIR}/include/os" - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" -) - -target_link_libraries(udf1_dup PUBLIC os) - add_library(udf2 STATIC MODULE udf2.c) -target_include_directories( - udf2 - PUBLIC - "${TD_SOURCE_DIR}/include/libs/function" - "${TD_SOURCE_DIR}/include/util" - "${TD_SOURCE_DIR}/include/common" - "${TD_SOURCE_DIR}/include/client" - "${TD_SOURCE_DIR}/include/os" - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" -) - target_link_libraries(udf2 PUBLIC os) -add_library(udf2_dup STATIC MODULE udf2_dup.c) -target_include_directories( - udf2_dup - PUBLIC - "${TD_SOURCE_DIR}/include/libs/function" - "${TD_SOURCE_DIR}/include/util" - "${TD_SOURCE_DIR}/include/common" - "${TD_SOURCE_DIR}/include/client" - "${TD_SOURCE_DIR}/include/os" - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" -) +add_library(udf1_dup STATIC MODULE udf1_dup.c) +target_link_libraries(udf1_dup PUBLIC os) +add_library(udf2_dup STATIC MODULE udf2_dup.c) target_link_libraries(udf2_dup PUBLIC os) set(TARGET_NAMES @@ -98,20 +48,7 @@ set(COMPILE_DEFINITIONS foreach(index RANGE 0 6) list(GET TARGET_NAMES ${index} target_name) list(GET COMPILE_DEFINITIONS ${index} compile_def) - add_library(${target_name} STATIC MODULE change_udf.c) - target_include_directories( - ${target_name} - PUBLIC - "${TD_SOURCE_DIR}/include/libs/function" - "${TD_SOURCE_DIR}/include/util" - "${TD_SOURCE_DIR}/include/common" - "${TD_SOURCE_DIR}/include/client" - "${TD_SOURCE_DIR}/include/os" - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" - ) target_compile_definitions(${target_name} PRIVATE ${compile_def}) - target_link_libraries( - ${target_name} PUBLIC os - ) -endforeach() + target_link_libraries(${target_name} PUBLIC os) +endforeach() \ No newline at end of file