From 4aec7066118dcb16a310a3e443c31a524293e825 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 28 Jun 2023 14:55:26 -0400 Subject: [PATCH] fix: tests were broken on Catch3 Signed-off-by: Henry Schreiner --- tests/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7bd47744c..f771aadc2 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -115,8 +115,8 @@ foreach(DATA_FILE IN LISTS DATA_FILES) "${CMAKE_CURRENT_BINARY_DIR}/${DATA_FILE}" MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/${DATA_FILE}" VERBATIM) - target_sources(catch_main PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/${DATA_FILE}") endforeach() +add_custom_target(cli11_test_data DEPENDS ${DATA_FILES}) # Build dependent applications which are launched from test code set(CLI11_DEPENDENT_APPLICATIONS system_args) @@ -124,7 +124,6 @@ set(CLI11_DEPENDENT_APPLICATIONS system_args) foreach(APP IN LISTS CLI11_DEPENDENT_APPLICATIONS) add_executable(${APP} applications/${APP}.cpp) target_include_directories(${APP} PRIVATE ${CMAKE_SOURCE_DIR}/include) - add_dependencies(catch_main ${APP}) endforeach() function(add_dependent_application_definitions TARGET) @@ -138,6 +137,7 @@ endfunction() # Target must already exist macro(add_catch_test TESTNAME) target_link_libraries(${TESTNAME} PUBLIC catch_main) + add_dependencies(${TESTNAME} cli11_test_data) add_test(${TESTNAME} ${TESTNAME}) set_target_properties(${TESTNAME} PROPERTIES FOLDER "Tests")