fly/flightgear
1
0
Fork 0
Code Activity

TestSuite: CMake fix for variables missing from the parent scope.

Browse source 
The test suite CMake target variables have been shifted back into
test_suite/CMakeLists.txt.  These are now correctly constructed and placed into
the parent scope where the test_suite target now resides.
This commit is contained in:
Edward d'Auvergne 2019-09-25 10:38:19 +02:00
parent 847275e65a
commit 3d13c16973
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CMakeLists.txt
View file

@ -612,19 +612,6 @@ ADD_CUSTOM_TARGET(uninstall
enable_testing() enable_testing()
add_subdirectory(test_suite EXCLUDE_FROM_ALL) add_subdirectory(test_suite EXCLUDE_FROM_ALL)
if(ENABLE_AUTOTESTING)
set(TEST_SUITE_COMMENT "Running the full FlightGear test suite.")
if(WIN32)
set(TEST_SUITE_COMMAND "run_test_suite.exe")
set(TEST_SUITE_WORKING_DIRECTORY "${TESTSUITE_OUTPUT_DIR}/${CMAKE_BUILD_TYPE}")
else()
set(TEST_SUITE_COMMAND "run_test_suite")
set(TEST_SUITE_WORKING_DIRECTORY "${TESTSUITE_OUTPUT_DIR}")
endif(WIN32)
else()
set(TEST_SUITE_COMMENT "Building the FlightGear test suite.")
endif(ENABLE_AUTOTESTING)
add_custom_target(test_suite add_custom_target(test_suite
${TEST_SUITE_COMMAND} ${TEST_SUITE_COMMAND}
DEPENDS run_test_suite DEPENDS run_test_suite

24
test_suite/CMakeLists.txt
View file

@ -126,6 +126,30 @@ set_target_properties(run_test_suite
PROPERTIES PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${TESTSUITE_OUTPUT_DIR}" RUNTIME_OUTPUT_DIRECTORY "${TESTSUITE_OUTPUT_DIR}"
) )
if(ENABLE_AUTOTESTING)
if(WIN32)
set(TEST_SUITE_COMMAND "run_test_suite.exe")
set(TEST_SUITE_WORKING_DIRECTORY "${TESTSUITE_OUTPUT_DIR}/${CMAKE_BUILD_TYPE}")
else()
set(TEST_SUITE_COMMAND "run_test_suite")
set(TEST_SUITE_WORKING_DIRECTORY "${TESTSUITE_OUTPUT_DIR}")
endif(WIN32)
set(TEST_SUITE_COMMENT "Running the full FlightGear test suite: ${TEST_SUITE_WORKING_DIRECTORY}/${TEST_SUITE_COMMAND}")
else()
set(TEST_SUITE_COMMENT "Building the FlightGear test suite.")
endif(ENABLE_AUTOTESTING)
set(TEST_SUITE_COMMAND
${TEST_SUITE_COMMAND}
PARENT_SCOPE
)
set(TEST_SUITE_WORKING_DIRECTORY
${TEST_SUITE_WORKING_DIRECTORY}
PARENT_SCOPE
)
set(TEST_SUITE_COMMENT
${TEST_SUITE_COMMENT}
PARENT_SCOPE
)
# Set up the target links. # Set up the target links.
setup_fgfs_libraries(run_test_suite) setup_fgfs_libraries(run_test_suite)