diff options
| -rw-r--r-- | Modules/CTest.cmake | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake index 7b737fa..d52a738 100644 --- a/Modules/CTest.cmake +++ b/Modules/CTest.cmake @@ -1,7 +1,7 @@ -# - setup CTest -# This file configures a project to use the CTest/Dart testing/dashboard process. -# -OPTION(BUILD_TESTING "Build the testing tree." ON) +# - setup CTest +# This file configures a project to use the CTest/Dart +# testing/dashboard process. +# OPTION(BUILD_TESTING "Build the testing tree." ON) IF(BUILD_TESTING) # Setup some auxilary macros @@ -81,9 +81,9 @@ IF(BUILD_TESTING) SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM}) FIND_PROGRAM(CVSCOMMAND cvs ) - SET(CVS_UPDATE_OPTIONS "-d -A -P" CACHE STRING "Options passed to the cvs update command.") + SET(CVS_UPDATE_OPTIONS "-d -A -P" CACHE STRING + "Options passed to the cvs update command.") FIND_PROGRAM(SVNCOMMAND svn) - #SET(SVN_UPDATE_OPTIONS "-d -A -P" CACHE STRING "Options passed to the svn update command.") IF(NOT UPDATE_TYPE) IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CVS") @@ -100,18 +100,17 @@ IF(BUILD_TESTING) ENDIF(NOT UPDATE_TYPE) IF(UPDATE_TYPE MATCHES "[Cc][Vv][Ss]") - MESSAGE(STATUS "This is a CVS repository") SET(UPDATE_COMMAND "${CVSCOMMAND}") SET(UPDATE_OPTIONS "${CVS_UPDATE_OPTIONS}") ELSE(UPDATE_TYPE MATCHES "[Cc][Vv][Ss]") IF(UPDATE_TYPE MATCHES "[Ss][Vv][Nn]") - MESSAGE(STATUS "This is a SVN repository") SET(UPDATE_COMMAND "${SVNCOMMAND}") SET(UPDATE_OPTIONS "${SVN_UPDATE_OPTIONS}") ENDIF(UPDATE_TYPE MATCHES "[Ss][Vv][Nn]") ENDIF(UPDATE_TYPE MATCHES "[Cc][Vv][Ss]") - SET(DART_TESTING_TIMEOUT 1500 CACHE STRING "MAximum time allowed before CTest will kill the test.") + SET(DART_TESTING_TIMEOUT 1500 CACHE STRING + "Maximum time allowed before CTest will kill the test.") FIND_PROGRAM(MEMORYCHECK_COMMAND NAMES purify valgrind boundscheck @@ -119,9 +118,14 @@ IF(BUILD_TESTING) "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Rational Software\\Purify\\Setup;InstallFolder]" DOC "Path to the memory checking command, used for memory error detection." ) - SET(MEMORYCHECK_SUPPRESSIONS_FILE "" CACHE FILEPATH "File that contains suppressions for the memory checker") - FIND_PROGRAM(SCPCOMMAND scp DOC "Path to scp command, used by CTest for submitting results to a Dart server") - FIND_PROGRAM(COVERAGE_COMMAND gcov DOC "Path to the coverage program that CTest uses for performing coverage inspection") + SET(MEMORYCHECK_SUPPRESSIONS_FILE "" CACHE FILEPATH + "File that contains suppressions for the memory checker") + FIND_PROGRAM(SCPCOMMAND scp DOC + "Path to scp command, used by CTest for submitting results to a Dart server" + ) + FIND_PROGRAM(COVERAGE_COMMAND gcov DOC + "Path to the coverage program that CTest uses for performing coverage inspection" + ) # set the site name SITE_NAME(SITE) @@ -146,9 +150,11 @@ IF(BUILD_TESTING) SET(BUILD_NAME_SYSTEM_NAME "Win32") ENDIF(WIN32) IF(UNIX OR BORLAND) - GET_FILENAME_COMPONENT(DART_CXX_NAME "${CMAKE_CXX_COMPILER}" ${DART_NAME_COMPONENT}) + GET_FILENAME_COMPONENT(DART_CXX_NAME + "${CMAKE_CXX_COMPILER}" ${DART_NAME_COMPONENT}) ELSE(UNIX OR BORLAND) - GET_FILENAME_COMPONENT(DART_CXX_NAME "${CMAKE_BUILD_TOOL}" ${DART_NAME_COMPONENT}) + GET_FILENAME_COMPONENT(DART_CXX_NAME + "${CMAKE_BUILD_TOOL}" ${DART_NAME_COMPONENT}) ENDIF(UNIX OR BORLAND) IF(DART_CXX_NAME MATCHES "msdev") SET(DART_CXX_NAME "vs60") @@ -165,7 +171,6 @@ IF(BUILD_TESTING) ENDIF(CMAKE_GENERATOR MATCHES "^Visual Studio 7$") ENDIF(DART_CXX_NAME MATCHES "devenv") SET(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}") - MESSAGE(STATUS "Using Buildname: ${BUILDNAME}") ENDIF(NOT BUILDNAME) # set the build command BUILD_COMMAND(MAKECOMMAND ${MAKEPROGRAM} ) |