From f6b1ddfac63c22c7e551d7d89cacc543ac687d66 Mon Sep 17 00:00:00 2001 From: Edward d'Auvergne Date: Mon, 17 Oct 2016 19:11:44 +0200 Subject: [PATCH] TestSuite: Windows support for the run_test_suite custom cmake target. A custom add_custom_target() function is required to allow the test suite to be executed by cmake under MS Windows. --- test_suite/CMakeLists.txt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/test_suite/CMakeLists.txt b/test_suite/CMakeLists.txt index 01f3aa355..571af07d9 100644 --- a/test_suite/CMakeLists.txt +++ b/test_suite/CMakeLists.txt @@ -142,9 +142,18 @@ set_target_properties(run_test_suite PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTSUITE_OUTPUT_DIR}" ) -add_custom_target(test_suite "${TESTSUITE_OUTPUT_DIR}/run_test_suite" - DEPENDS run_test_suite - COMMENT "Running the full FlightGear test-suite.") +if(WIN32) + add_custom_target(test_suite "run_test_suite.exe" + DEPENDS run_test_suite + WORKING_DIRECTORY "${TESTSUITE_OUTPUT_DIR}/${CMAKE_BUILD_TYPE}" + COMMENT "Running the full FlightGear test-suite." + ) +else() + add_custom_target(test_suite "${TESTSUITE_OUTPUT_DIR}/run_test_suite" + DEPENDS run_test_suite + COMMENT "Running the full FlightGear test-suite." + ) +endif(WIN32) #-----------------------------------------------------------------------------