From 3d13c16973b2cb67bcd4efe45fc76aca7b148bac Mon Sep 17 00:00:00 2001
From: Edward d'Auvergne <edward@nmr-relax.com>
Date: Wed, 25 Sep 2019 10:38:19 +0200
Subject: [PATCH] TestSuite: CMake fix for variables missing from the parent
scope.
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.
---
CMakeLists.txt | 13 -------------
test_suite/CMakeLists.txt | 24 ++++++++++++++++++++++++
2 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9688a7ee..c2026912b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -612,19 +612,6 @@ ADD_CUSTOM_TARGET(uninstall
enable_testing()
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
${TEST_SUITE_COMMAND}
DEPENDS run_test_suite
diff --git a/test_suite/CMakeLists.txt b/test_suite/CMakeLists.txt
index 3fc040ba9..907c54be0 100644
--- a/test_suite/CMakeLists.txt
+++ b/test_suite/CMakeLists.txt
@@ -126,6 +126,30 @@ set_target_properties(run_test_suite
PROPERTIES
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.
setup_fgfs_libraries(run_test_suite)