diff options
| -rw-r--r-- | Modules/CTest.cmake | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake index 6a8977c..76f2568 100644 --- a/Modules/CTest.cmake +++ b/Modules/CTest.cmake @@ -6,9 +6,9 @@ OPTION(BUILD_TESTING "Build the testing tree." ON) IF(BUILD_TESTING) # Setup some auxilary macros MACRO(SET_IF_NOT_SET var val) - IF(NOT "${${var}}") + IF(NOT DEFINED "${var}") SET("${var}" "${val}") - ENDIF(NOT "${${var}}") + ENDIF(NOT DEFINED "${var}") ENDMACRO(SET_IF_NOT_SET) MACRO(SET_IF_SET var val) @@ -21,6 +21,18 @@ IF(BUILD_TESTING) # Make sure testing is enabled ENABLE_TESTING() + IF(EXISTS "${PROJECT_SOURCE_DIR}/CTestConfig.cmake") + INCLUDE("${PROJECT_SOURCE_DIR}/CTestConfig.cmake") + SET_IF_SET(NIGHTLY_START_TIME "${CTEST_NIGHTLY_START_TIME}") + SET_IF_SET(DROP_METHOD "${CTEST_DROP_METHOD}") + SET_IF_SET(DROP_SITE "${CTEST_DROP_SITE}") + SET_IF_SET(DROP_SITE_USER "${CTEST_DROP_SITE_USER}") + SET_IF_SET(DROP_SITE_PASSWORD "${CTEST_DROP_SITE_PASWORD}") + SET_IF_SET(DROP_SITE_MODE "${CTEST_DROP_SITE_MODE}") + SET_IF_SET(DROP_LOCATION "${CTEST_DROP_LOCATION}") + SET_IF_SET(TRIGGER_SITE "${CTEST_TRIGGER_SITE}") + ENDIF(EXISTS "${PROJECT_SOURCE_DIR}/CTestConfig.cmake") + # the project can have a DartConfig.cmake file IF(EXISTS "${PROJECT_SOURCE_DIR}/DartConfig.cmake") INCLUDE("${PROJECT_SOURCE_DIR}/DartConfig.cmake") @@ -55,17 +67,7 @@ IF(BUILD_TESTING) #SET (USE_DOXYGEN "Off") #SET (DOXYGEN_URL "" ) ENDIF(EXISTS "${PROJECT_SOURCE_DIR}/DartConfig.cmake") - IF(EXISTS "${PROJECT_SOURCE_DIR}/CTestConfig.cmake") - INCLUDE("${PROJECT_SOURCE_DIR}/CTestConfig.cmake") - SET_IF_SET(NIGHTLY_START_TIME "${CTEST_NIGHTLY_START_TIME}") - SET_IF_SET(DROP_METHOD "${CTEST_DROP_METHOD}") - SET_IF_SET(DROP_SITE "${CTEST_DROP_SITE}") - SET_IF_SET(DROP_SITE_USER "${CTEST_DROP_SITE_USER}") - SET_IF_SET(DROP_SITE_PASSWORD "${CTEST_DROP_SITE_PASWORD}") - SET_IF_SET(DROP_SITE_MODE "${CTEST_DROP_SITE_MODE}") - SET_IF_SET(DROP_LOCATION "${CTEST_DROP_LOCATION}") - SET_IF_SET(TRIGGER_SITE "${CTEST_TRIGGER_SITE}") - ENDIF(EXISTS "${PROJECT_SOURCE_DIR}/CTestConfig.cmake") + SET_IF_NOT_SET (NIGHTLY_START_TIME "00:00:00 EDT") # make program just needs to use CMAKE_MAKE_PROGRAM which is required # to be defined by cmake |