diff --git a/source/libs/executor/test/CMakeLists.txt b/source/libs/executor/test/CMakeLists.txt index ebf7131aa5..b5e58ee05e 100644 --- a/source/libs/executor/test/CMakeLists.txt +++ b/source/libs/executor/test/CMakeLists.txt @@ -2,23 +2,22 @@ MESSAGE(STATUS "build parser unit test") # IF(NOT TD_DARWIN) -# # GoogleTest requires at least C++11 -# SET(CMAKE_CXX_STANDARD 11) -# AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST) -# -# ADD_EXECUTABLE(executorTest ${SOURCE_LIST}) -# TARGET_LINK_LIBRARIES( -# executorTest -# PRIVATE os util common transport gtest taos_static qcom executor function planner scalar nodes vnode -# ) -# -# TARGET_INCLUDE_DIRECTORIES( -# executorTest -# PUBLIC "${TD_SOURCE_DIR}/include/libs/executor/" -# PRIVATE "${TD_SOURCE_DIR}/source/libs/executor/inc" -# ) +# # GoogleTest requires at least C++11 +# SET(CMAKE_CXX_STANDARD 11) +# AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST) +# +# ADD_EXECUTABLE(executorTest ${SOURCE_LIST}) +# TARGET_LINK_LIBRARIES( +# executorTest +# PRIVATE os util common transport gtest taos_static qcom executor function planner scalar nodes vnode +# ) +# +# TARGET_INCLUDE_DIRECTORIES( +# executorTest +# PUBLIC "${TD_SOURCE_DIR}/include/libs/executor/" +# PRIVATE "${TD_SOURCE_DIR}/source/libs/executor/inc" +# ) # ENDIF () - SET(CMAKE_CXX_STANDARD 11) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST) diff --git a/source/libs/index/test/CMakeLists.txt b/source/libs/index/test/CMakeLists.txt index eff74f93d2..e8a8194ea2 100644 --- a/source/libs/index/test/CMakeLists.txt +++ b/source/libs/index/test/CMakeLists.txt @@ -7,160 +7,159 @@ IF(NOT TD_DARWIN) add_executable(idxFstUtilUT "") target_sources(idxTest - PRIVATE - "indexTests.cc" + PRIVATE + "indexTests.cc" ) target_sources(idxFstTest - PRIVATE - "fstTest.cc" + PRIVATE + "fstTest.cc" ) target_sources(idxFstUT - PRIVATE - "fstUT.cc" + PRIVATE + "fstUT.cc" ) target_sources(idxUtilUT - PRIVATE - "utilUT.cc" + PRIVATE + "utilUT.cc" ) target_sources(idxJsonUT - PRIVATE - "jsonUT.cc" + PRIVATE + "jsonUT.cc" ) target_sources(idxFstUtilUT - PRIVATE - "fstUtilUT.cc" + PRIVATE + "fstUtilUT.cc" + ) + + target_include_directories(idxTest + PUBLIC + "${TD_SOURCE_DIR}/include/libs/index" + "${CMAKE_CURRENT_SOURCE_DIR}/../inc" + ) + target_include_directories(idxFstTest + PUBLIC + "${TD_SOURCE_DIR}/include/libs/index" + "${CMAKE_CURRENT_SOURCE_DIR}/../inc" ) - - target_include_directories (idxTest - PUBLIC - "${TD_SOURCE_DIR}/include/libs/index" - "${CMAKE_CURRENT_SOURCE_DIR}/../inc" - ) - target_include_directories (idxFstTest - PUBLIC - "${TD_SOURCE_DIR}/include/libs/index" - "${CMAKE_CURRENT_SOURCE_DIR}/../inc" - ) target_sources(idxJsonUT - PRIVATE - "jsonUT.cc" + PRIVATE + "jsonUT.cc" ) - target_include_directories (idxTest + target_include_directories(idxTest PUBLIC - "${TD_SOURCE_DIR}/include/libs/index" + "${TD_SOURCE_DIR}/include/libs/index" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" - ) - target_include_directories (idxFstTest + ) + target_include_directories(idxFstTest PUBLIC - "${TD_SOURCE_DIR}/include/libs/index" + "${TD_SOURCE_DIR}/include/libs/index" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" - ) + ) - target_include_directories (idxFstUT + target_include_directories(idxFstUT PUBLIC - "${TD_SOURCE_DIR}/include/libs/index" + "${TD_SOURCE_DIR}/include/libs/index" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" - ) + ) - target_include_directories (idxUtilUT + target_include_directories(idxUtilUT PUBLIC - "${TD_SOURCE_DIR}/include/libs/index" + "${TD_SOURCE_DIR}/include/libs/index" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" - ) + ) - target_include_directories (idxJsonUT - PUBLIC - "${TD_SOURCE_DIR}/include/libs/index" - "${CMAKE_CURRENT_SOURCE_DIR}/../inc" - ) - target_include_directories (idxFstUtilUT - PUBLIC - "${TD_SOURCE_DIR}/include/libs/index" - "${CMAKE_CURRENT_SOURCE_DIR}/../inc" - ) - target_include_directories (idxJsonUT + target_include_directories(idxJsonUT PUBLIC - "${TD_SOURCE_DIR}/include/libs/index" + "${TD_SOURCE_DIR}/include/libs/index" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" - ) + ) + target_include_directories(idxFstUtilUT + PUBLIC + "${TD_SOURCE_DIR}/include/libs/index" + "${CMAKE_CURRENT_SOURCE_DIR}/../inc" + ) + target_include_directories(idxJsonUT + PUBLIC + "${TD_SOURCE_DIR}/include/libs/index" + "${CMAKE_CURRENT_SOURCE_DIR}/../inc" + ) - target_link_libraries (idxTest - os + target_link_libraries(idxTest + os util common gtest_main index ) - target_link_libraries (idxFstTest - os + target_link_libraries(idxFstTest + os util common gtest_main index ) - target_link_libraries (idxFstUT - os + target_link_libraries(idxFstUT + os util common gtest_main index ) - target_link_libraries (idxTest - os + target_link_libraries(idxTest + os util common gtest_main index ) - target_link_libraries (idxFstTest - os + target_link_libraries(idxFstTest + os util common gtest_main index ) - target_link_libraries (idxFstUT - os + target_link_libraries(idxFstUT + os util common gtest_main index ) - target_link_libraries (idxUtilUT - os + target_link_libraries(idxUtilUT + os util common gtest_main index ) - target_link_libraries (idxJsonUT - os + target_link_libraries(idxJsonUT + os util common gtest_main index ) - target_link_libraries (idxFstUtilUT - os + target_link_libraries(idxFstUtilUT + os util common gtest_main index ) - + add_test( NAME idxJsonUT - COMMAND idxJsonUT + COMMAND idxJsonUT ) add_test( - NAME idxFstUtilUT - COMMAND idxFstUtilUT - + NAME idxFstUtilUT + COMMAND idxFstUtilUT ) add_test( @@ -168,15 +167,15 @@ IF(NOT TD_DARWIN) COMMAND idxTest ) add_test( - NAME idxUtilUT - COMMAND idxUtilUT + NAME idxUtilUT + COMMAND idxUtilUT ) add_test( - NAME idxFstUT - COMMAND idxFstUT + NAME idxFstUT + COMMAND idxFstUT ) add_test( NAME idxFstTest - COMMAND idxFstTest + COMMAND idxFstTest ) -ENDIF () +ENDIF() diff --git a/source/libs/qworker/test/CMakeLists.txt b/source/libs/qworker/test/CMakeLists.txt index 22870ea94d..e87456cf72 100644 --- a/source/libs/qworker/test/CMakeLists.txt +++ b/source/libs/qworker/test/CMakeLists.txt @@ -1,5 +1,6 @@ MESSAGE(STATUS "build qworker unit test") + IF(NOT TD_DARWIN) # GoogleTest requires at least C++11 SET(CMAKE_CXX_STANDARD 11)