[Cmake-commits] CMake branch, next, updated. v2.8.3-1511-gbe2fd29
David Cole
david.cole at kitware.com
Fri Jan 28 06:48:43 EST 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via be2fd29aa802e2b2b4a8e3fd869ada92673391ab (commit)
via b5e369229900c121ab997b67d185026057f4a199 (commit)
via 6744616fb2c6397893c5b41bb4473fa8d420a57b (commit)
from 5a42c3e1c56db691c2eefa3d4d375b2fd6906c2c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be2fd29aa802e2b2b4a8e3fd869ada92673391ab
commit be2fd29aa802e2b2b4a8e3fd869ada92673391ab
Merge: 5a42c3e b5e3692
Author: David Cole <david.cole at kitware.com>
AuthorDate: Fri Jan 28 06:48:39 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 28 06:48:39 2011 -0500
Merge topic 'fix-10150-mark-timeout-advanced' into next
b5e3692 CTest: Mark DART_TESTING_TIMEOUT as advanced (#10150)
6744616 KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5e369229900c121ab997b67d185026057f4a199
commit b5e369229900c121ab997b67d185026057f4a199
Author: David Cole <david.cole at kitware.com>
AuthorDate: Fri Jan 28 06:32:27 2011 -0500
Commit: David Cole <david.cole at kitware.com>
CommitDate: Fri Jan 28 06:32:27 2011 -0500
CTest: Mark DART_TESTING_TIMEOUT as advanced (#10150)
Also, split a long line into two. And alphabetize the
variables mentioned in the mark_as_advanced call.
diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake
index bb76ddd..c261eb3 100644
--- a/Modules/CTest.cmake
+++ b/Modules/CTest.cmake
@@ -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)
-----------------------------------------------------------------------
Summary of changes:
Modules/CTest.cmake | 21 +++++++++++----------
Source/kwsys/kwsysDateStamp.cmake | 2 +-
2 files changed, 12 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list