Remove unnecessary project() calls

project() should only be called if the subdirectory, in fact, can be
built standalone.
This commit is contained in:
2024-11-18 15:42:37 +01:00
parent e1b8bbf12d
commit ca9ef16d0d
13 changed files with 57 additions and 72 deletions

View File

@@ -2,21 +2,19 @@
### tests_configuration ###
###############################################
project(tests_configuration)
add_executable(${PROJECT_NAME}
add_executable(tests_configuration
test_configuration.cpp
test_json.cpp
)
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER tests/configuration)
set_target_properties(tests_configuration PROPERTIES FOLDER tests/configuration)
target_link_libraries(${PROJECT_NAME} PRIVATE
target_link_libraries(tests_configuration PRIVATE
DRAMSys::config
gtest_main
)
gtest_discover_tests(${PROJECT_NAME}
gtest_discover_tests(tests_configuration
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)

View File

@@ -2,9 +2,7 @@
### tests_dramsys ###
###############################################
project(tests_dramsys)
add_executable(${PROJECT_NAME}
add_executable(tests_dramsys
AddressDecoderTests.cpp
b_transport/b_transport.cpp
main.cpp
@@ -12,13 +10,13 @@ add_executable(${PROJECT_NAME}
test_utils.cpp
)
target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR})
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER tests)
target_link_libraries(${PROJECT_NAME}
target_include_directories(tests_dramsys PUBLIC ${PROJECT_SOURCE_DIR})
set_target_properties(tests_dramsys PROPERTIES FOLDER tests)
target_link_libraries(tests_dramsys
DRAMSys::libdramsys
gtest_main
)
gtest_discover_tests(${PROJECT_NAME}
gtest_discover_tests(tests_dramsys
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)

View File

@@ -35,8 +35,6 @@
### tests_regression ###
###############################################
project(tests_regression)
find_program(SqlDiff sqldiff)
if(NOT SqlDiff)

View File

@@ -2,22 +2,20 @@
### tests_simulator ###
###############################################
project(tests_simulator)
add_executable(${PROJECT_NAME}
add_executable(tests_simulator
main.cpp
cache/tests_cache.cpp
cache/TargetMemory.cpp
cache/ListInitiator.cpp
)
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER tests/simulator)
set_target_properties(tests_simulator PROPERTIES FOLDER tests/simulator)
target_link_libraries(${PROJECT_NAME} PRIVATE
DRAMSys_Simulator
target_link_libraries(tests_simulator PRIVATE
simulator
gtest_main
)
gtest_discover_tests(${PROJECT_NAME}
gtest_discover_tests(tests_simulator
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)