|
|
@@ -63,7 +63,8 @@ OPTION(BUILD_TESTING "Build the testing tree." ON)
|
|
|
# function to turn generator name into a version string
|
|
|
# like vs7 vs71 vs8 vs9
|
|
|
FUNCTION(GET_VS_VERSION_STRING generator var)
|
|
|
- STRING(REGEX REPLACE "Visual Studio ([0-9][0-9]?)($|.*)" "\\1" NUMBER "${generator}")
|
|
|
+ STRING(REGEX REPLACE "Visual Studio ([0-9][0-9]?)($|.*)" "\\1"
|
|
|
+ NUMBER "${generator}")
|
|
|
IF("${generator}" MATCHES "Visual Studio 7 .NET 2003")
|
|
|
SET(ver_string "vs71")
|
|
|
ELSE("${generator}" MATCHES "Visual Studio 7 .NET 2003")
|
|
|
@@ -253,15 +254,16 @@ IF(BUILD_TESTING)
|
|
|
ENDIF(CTEST_USE_LAUNCHERS)
|
|
|
|
|
|
MARK_AS_ADVANCED(
|
|
|
+ BZRCOMMAND
|
|
|
+ BZR_UPDATE_OPTIONS
|
|
|
COVERAGE_COMMAND
|
|
|
+ CTEST_SUBMIT_RETRY_DELAY
|
|
|
+ CTEST_SUBMIT_RETRY_COUNT
|
|
|
CVSCOMMAND
|
|
|
- SVNCOMMAND
|
|
|
- BZRCOMMAND
|
|
|
- HGCOMMAND
|
|
|
- GITCOMMAND
|
|
|
CVS_UPDATE_OPTIONS
|
|
|
- SVN_UPDATE_OPTIONS
|
|
|
- BZR_UPDATE_OPTIONS
|
|
|
+ DART_TESTING_TIMEOUT
|
|
|
+ GITCOMMAND
|
|
|
+ HGCOMMAND
|
|
|
MAKECOMMAND
|
|
|
MEMORYCHECK_COMMAND
|
|
|
MEMORYCHECK_SUPPRESSIONS_FILE
|
|
|
@@ -270,10 +272,9 @@ IF(BUILD_TESTING)
|
|
|
SLURM_SBATCH_COMMAND
|
|
|
SLURM_SRUN_COMMAND
|
|
|
SITE
|
|
|
- CTEST_SUBMIT_RETRY_DELAY
|
|
|
- CTEST_SUBMIT_RETRY_COUNT
|
|
|
+ SVNCOMMAND
|
|
|
+ SVN_UPDATE_OPTIONS
|
|
|
)
|
|
|
- # BUILDNAME
|
|
|
IF(NOT RUN_FROM_DART)
|
|
|
SET(RUN_FROM_CTEST_OR_DART 1)
|
|
|
INCLUDE(CTestTargets)
|