diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ac5fc54038..718cf7cd9b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -542,6 +542,12 @@ if (ENABLE_TESTS) "${CMAKE_SOURCE_DIR}/cmake_templates/CTestCustom.cmake.in" "${CMAKE_BINARY_DIR}/CTestCustom.cmake" IMMEDIATE @ONLY) + if (PUSH_TO_CDASH) + configure_file( + "${CMAKE_SOURCE_DIR}/cmake_templates/CTestConfig.cmake.in" + "${CMAKE_BINARY_DIR}/CTestConfig.cmake" + IMMEDIATE @ONLY) + endif() # For server side testing we have no X, we can use xvfb as a fake x # sudo apt-get install xvfb add_custom_target(check COMMAND xvfb-run --server-args=-screen\ 0\ 1024x768x24 ctest --output-on-failure) @@ -1049,7 +1055,6 @@ if (ENABLE_TESTS) add_subdirectory(tests) set (CTEST_BINARY_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/bin" ) message (STATUS "Ctest Binary Directory set to: ${CTEST_BINARY_DIRECTORY}") - message (STATUS "Ctest drop site: ${CTEST_DROP_SITE}") endif() ############################################################# diff --git a/CTestConfig.cmake b/cmake_templates/CTestConfig.cmake.in similarity index 65% rename from CTestConfig.cmake rename to cmake_templates/CTestConfig.cmake.in index fae5b236a95..4bcaa3c059b 100644 --- a/CTestConfig.cmake +++ b/cmake_templates/CTestConfig.cmake.in @@ -7,9 +7,7 @@ set(CTEST_PROJECT_NAME "QGIS") set(CTEST_NIGHTLY_START_TIME "20:00:00 CEST") -if (PUSH_TO_CDASH) - set(CTEST_DROP_METHOD "https") - set(CTEST_DROP_SITE "cdash.orfeo-toolbox.org") - set(CTEST_DROP_LOCATION "/submit.php?project=QGIS") - set(CTEST_DROP_SITE_CDASH TRUE) -endif() +set(CTEST_DROP_METHOD "https") +set(CTEST_DROP_SITE "cdash.orfeo-toolbox.org") +set(CTEST_DROP_LOCATION "/submit.php?project=QGIS") +set(CTEST_DROP_SITE_CDASH TRUE)