diff options
| author | Brad King <brad.king@kitware.com> | 2010-05-17 17:34:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-05-17 17:34:29 (GMT) |
| commit | 3ebb41d58ae4d791f39a2f65d7dbe5fc2d3ddff3 (patch) | |
| tree | 746999c765846c5978e8a5be682c561c0db6cda6 /Source/cmDocumentVariables.cxx | |
| parent | 0559c4e04e002555dd09a57b41e4d83645a82f37 (diff) | |
| parent | c70fcf64aba77443bdb8bef3a62886c29a112df2 (diff) | |
| download | CMake-3ebb41d58ae4d791f39a2f65d7dbe5fc2d3ddff3.zip CMake-3ebb41d58ae4d791f39a2f65d7dbe5fc2d3ddff3.tar.gz CMake-3ebb41d58ae4d791f39a2f65d7dbe5fc2d3ddff3.tar.bz2 | |
Merge branch 'version'
Diffstat (limited to 'Source/cmDocumentVariables.cxx')
| -rw-r--r-- | Source/cmDocumentVariables.cxx | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx index 68b0d57..e77119f 100644 --- a/Source/cmDocumentVariables.cxx +++ b/Source/cmDocumentVariables.cxx @@ -251,12 +251,22 @@ void cmDocumentVariables::DefineVariables(cmake* cm) " executable being run.",false, "Variables that Provide Information"); cm->DefineProperty + ("CMAKE_TWEAK_VERSION", cmProperty::VARIABLE, + "The tweak version of cmake (i.e. the 1 in X.X.X.1).", + "This specifies the tweak version of the CMake executable being run. " + "Releases use tweak < 20000000 and development versions use the date " + "format CCYYMMDD for the tweak level." + ,false, "Variables that Provide Information"); + cm->DefineProperty ("CMAKE_VERSION", cmProperty::VARIABLE, - "The full version of cmake in major.minor.patch format.", + "The full version of cmake in major.minor.patch[.tweak[-id]] format.", "This specifies the full version of the CMake executable being run. " "This variable is defined by versions 2.6.3 and higher. " - "See variables CMAKE_MAJOR_VERSION, CMAKE_MINOR_VERSION, and " - "CMAKE_PATCH_VERSION for individual version components.", false, + "See variables CMAKE_MAJOR_VERSION, CMAKE_MINOR_VERSION, " + "CMAKE_PATCH_VERSION, and CMAKE_TWEAK_VERSION " + "for individual version components. " + "The [-id] component appears in non-release versions " + "and may be arbitrary text.", false, "Variables that Provide Information"); cm->DefineProperty |