summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-08-18 15:21:55 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-08-18 15:21:55 (GMT)
commite7dda7b9b7373dc823977766d0947a4ca28845cd (patch)
treef63fc18d0ff729134934c0e8ee800496a497c45a /Help/manual
parentde547ca5c3053293d144b3c8b133f701d4b81150 (diff)
parent653529ce55a9c33fa7378708793caac92a857794 (diff)
downloadCMake-e7dda7b9b7373dc823977766d0947a4ca28845cd.zip
CMake-e7dda7b9b7373dc823977766d0947a4ca28845cd.tar.gz
CMake-e7dda7b9b7373dc823977766d0947a4ca28845cd.tar.bz2
Merge topic 'ctest_update_status_only'
653529ce CTest: Allow / to be in the build name, and be consistent with the build name 39b5df2f ctest_update: Add CTEST_UPDATE_VERSION_ONLY option to only note the version
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-variables.7.rst1
-rw-r--r--Help/manual/ctest.1.rst9
2 files changed, 10 insertions, 0 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index e622784..2124f7d 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -362,6 +362,7 @@ Variables for CTest
/variable/CTEST_TRIGGER_SITE
/variable/CTEST_UPDATE_COMMAND
/variable/CTEST_UPDATE_OPTIONS
+ /variable/CTEST_UPDATE_VERSION_ONLY
/variable/CTEST_USE_LAUNCHERS
Variables for CPack
diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst
index a57a8f0..52e4beb 100644
--- a/Help/manual/ctest.1.rst
+++ b/Help/manual/ctest.1.rst
@@ -668,6 +668,15 @@ Configuration settings to specify the version control tool include:
* :module:`CTest` module variable: ``UPDATE_TYPE`` if set,
else ``CTEST_UPDATE_TYPE``
+``UpdateVersionOnly``
+ Specify that you want the version control update command to only
+ discover the current version that is checked out, and not to update
+ to a different version.
+
+ * `CTest Script`_ variable: :variable:`CTEST_UPDATE_VERSION_ONLY`
+
+
+
Additional configuration settings include:
``NightlyStartTime``