From 5db648038b9866aea6c390a23d599f45f5fe6b81 Mon Sep 17 00:00:00 2001 From: Simon Guan Date: Mon, 3 Mar 2025 15:00:34 +0800 Subject: [PATCH] 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}