kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Fix the missing nightly start time bug and do some cleanup

This commit is contained in:
Andy Cedilnik 2006-04-21 14:36:48 -04:00
parent f5e6885155
commit 4e4ae3624b
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Modules/CTest.cmake
View File

@ -6,9 +6,9 @@ OPTION(BUILD_TESTING "Build the testing tree." ON)
IF(BUILD_TESTING) IF(BUILD_TESTING)
# Setup some auxilary macros # Setup some auxilary macros
MACRO(SET_IF_NOT_SET var val) MACRO(SET_IF_NOT_SET var val)
IF(NOT "${${var}}") IF(NOT DEFINED "${var}")
SET("${var}" "${val}") SET("${var}" "${val}")
ENDIF(NOT "${${var}}") ENDIF(NOT DEFINED "${var}")
ENDMACRO(SET_IF_NOT_SET) ENDMACRO(SET_IF_NOT_SET)
MACRO(SET_IF_SET var val) MACRO(SET_IF_SET var val)
@ -21,6 +21,18 @@ IF(BUILD_TESTING)
# Make sure testing is enabled # Make sure testing is enabled
ENABLE_TESTING() 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 # the project can have a DartConfig.cmake file
IF(EXISTS "${PROJECT_SOURCE_DIR}/DartConfig.cmake") IF(EXISTS "${PROJECT_SOURCE_DIR}/DartConfig.cmake")
INCLUDE("${PROJECT_SOURCE_DIR}/DartConfig.cmake") INCLUDE("${PROJECT_SOURCE_DIR}/DartConfig.cmake")
@ -55,17 +67,7 @@ IF(BUILD_TESTING)
#SET (USE_DOXYGEN "Off") #SET (USE_DOXYGEN "Off")
#SET (DOXYGEN_URL "" ) #SET (DOXYGEN_URL "" )
ENDIF(EXISTS "${PROJECT_SOURCE_DIR}/DartConfig.cmake") ENDIF(EXISTS "${PROJECT_SOURCE_DIR}/DartConfig.cmake")
IF(EXISTS "${PROJECT_SOURCE_DIR}/CTestConfig.cmake") SET_IF_NOT_SET (NIGHTLY_START_TIME "00:00:00 EDT")
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")
# make program just needs to use CMAKE_MAKE_PROGRAM which is required # make program just needs to use CMAKE_MAKE_PROGRAM which is required
# to be defined by cmake # to be defined by cmake