mirrors/CLI11
1
0
Fork 0
mirror of https://github.com/CLIUtils/CLI11.git synced 2025-05-01 05:03:52 +00:00
Code Issues Releases Wiki Activity

fix: tests were broken on Catch3 (#896)

Browse Source 
These were invalid on an imported target (and was incorrect anyway).

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
This commit is contained in:
Henry Schreiner 2023-06-28 15:41:08 -04:00 committed by GitHub
parent 335ca29dcb
commit c8cd053b93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/CMakeLists.txt
View File

@ -115,8 +115,8 @@ foreach(DATA_FILE IN LISTS DATA_FILES)
"${CMAKE_CURRENT_BINARY_DIR}/${DATA_FILE}" "${CMAKE_CURRENT_BINARY_DIR}/${DATA_FILE}"
MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/${DATA_FILE}" MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/${DATA_FILE}"
VERBATIM) VERBATIM)
target_sources(catch_main PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/${DATA_FILE}")
endforeach() endforeach()
add_custom_target(cli11_test_data DEPENDS ${DATA_FILES})
# Build dependent applications which are launched from test code # Build dependent applications which are launched from test code
set(CLI11_DEPENDENT_APPLICATIONS system_args) set(CLI11_DEPENDENT_APPLICATIONS system_args)
@ -124,7 +124,6 @@ set(CLI11_DEPENDENT_APPLICATIONS system_args)
foreach(APP IN LISTS CLI11_DEPENDENT_APPLICATIONS) foreach(APP IN LISTS CLI11_DEPENDENT_APPLICATIONS)
add_executable(${APP} applications/${APP}.cpp) add_executable(${APP} applications/${APP}.cpp)
target_include_directories(${APP} PRIVATE ${CMAKE_SOURCE_DIR}/include) target_include_directories(${APP} PRIVATE ${CMAKE_SOURCE_DIR}/include)
add_dependencies(catch_main ${APP})
endforeach() endforeach()
function(add_dependent_application_definitions TARGET) function(add_dependent_application_definitions TARGET)
@ -138,6 +137,7 @@ endfunction()
# Target must already exist # Target must already exist
macro(add_catch_test TESTNAME) macro(add_catch_test TESTNAME)
target_link_libraries(${TESTNAME} PUBLIC catch_main) target_link_libraries(${TESTNAME} PUBLIC catch_main)
add_dependencies(${TESTNAME} cli11_test_data)
add_test(${TESTNAME} ${TESTNAME}) add_test(${TESTNAME} ${TESTNAME})
set_target_properties(${TESTNAME} PROPERTIES FOLDER "Tests") set_target_properties(${TESTNAME} PROPERTIES FOLDER "Tests")