[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7424-g76f39c1
Brad King
brad.king at kitware.com
Tue Feb 4 17:04:28 EST 2014
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 76f39c1886b24a5beed89b6abc22c98c8eec90bd (commit)
via 153627867e816c40da99989d81636ba7ca098dda (commit)
from 0daa3aa4011efbbb760e7e8d59a5ee4227376812 (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=76f39c1886b24a5beed89b6abc22c98c8eec90bd
commit 76f39c1886b24a5beed89b6abc22c98c8eec90bd
Merge: 0daa3aa 1536278
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 4 17:04:27 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 4 17:04:27 2014 -0500
Merge topic 'doc-version-components' into next
15362786 Help: Expand documentation of CMAKE_VERSION and related variables
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=153627867e816c40da99989d81636ba7ca098dda
commit 153627867e816c40da99989d81636ba7ca098dda
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 4 15:51:11 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 4 17:03:43 2014 -0500
Help: Expand documentation of CMAKE_VERSION and related variables
Describe the meaning of each version component in more detail in the
documentation of CMAKE_VERSION. Simplify the per-component version
variable documentation by referencing the main variable.
diff --git a/Help/variable/CMAKE_MAJOR_VERSION.rst b/Help/variable/CMAKE_MAJOR_VERSION.rst
index 7dd24e5..079ad70 100644
--- a/Help/variable/CMAKE_MAJOR_VERSION.rst
+++ b/Help/variable/CMAKE_MAJOR_VERSION.rst
@@ -1,6 +1,5 @@
CMAKE_MAJOR_VERSION
-------------------
-The Major version of cmake (i.e. the 2 in 2.X.X)
-
-This specifies the major version of the CMake executable being run.
+First version number component of the :variable:`CMAKE_VERSION`
+variable.
diff --git a/Help/variable/CMAKE_MINOR_VERSION.rst b/Help/variable/CMAKE_MINOR_VERSION.rst
index bbc1073..f67cfb9 100644
--- a/Help/variable/CMAKE_MINOR_VERSION.rst
+++ b/Help/variable/CMAKE_MINOR_VERSION.rst
@@ -1,6 +1,5 @@
CMAKE_MINOR_VERSION
-------------------
-The Minor version of cmake (i.e. the 4 in X.4.X).
-
-This specifies the minor version of the CMake executable being run.
+Second version number component of the :variable:`CMAKE_VERSION`
+variable.
diff --git a/Help/variable/CMAKE_PATCH_VERSION.rst b/Help/variable/CMAKE_PATCH_VERSION.rst
index fe68bf2..991ae76 100644
--- a/Help/variable/CMAKE_PATCH_VERSION.rst
+++ b/Help/variable/CMAKE_PATCH_VERSION.rst
@@ -1,6 +1,5 @@
CMAKE_PATCH_VERSION
-------------------
-The patch version of cmake (i.e. the 3 in X.X.3).
-
-This specifies the patch version of the CMake executable being run.
+Third version number component of the :variable:`CMAKE_VERSION`
+variable.
diff --git a/Help/variable/CMAKE_TWEAK_VERSION.rst b/Help/variable/CMAKE_TWEAK_VERSION.rst
index 56270aa..a2c8f35 100644
--- a/Help/variable/CMAKE_TWEAK_VERSION.rst
+++ b/Help/variable/CMAKE_TWEAK_VERSION.rst
@@ -1,8 +1,5 @@
CMAKE_TWEAK_VERSION
-------------------
-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.
+Fourth version number component of the :variable:`CMAKE_VERSION`
+variable.
diff --git a/Help/variable/CMAKE_VERSION.rst b/Help/variable/CMAKE_VERSION.rst
index 4ccc491..6f27706 100644
--- a/Help/variable/CMAKE_VERSION.rst
+++ b/Help/variable/CMAKE_VERSION.rst
@@ -1,10 +1,40 @@
CMAKE_VERSION
-------------
-The full version of cmake in major.minor.patch[.tweak[-id]] format.
+The full version of CMake as up to four non-negative integer components
+separated by periods. The first three components represent the feature
+level and the fourth component represents either a bug-fix level or
+development date.
-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, CMAKE_PATCH_VERSION, and
-CMAKE_TWEAK_VERSION for individual version components. The [-id]
-component appears in non-release versions and may be arbitrary text.
+Release versions and release candidate versions of CMake use the format::
+
+ <major>.<minor>.<patch>[.<tweak>][-rc<n>]
+
+where the ``<tweak>`` component is less than ``20000000``. Development
+versions of CMake use the format::
+
+ <major>.<minor>.<patch>.<date>[-<id>]
+
+where the ``<date>`` component is of format ``CCYYMMDD`` and ``<id>``
+may contain arbitrary text. This represents development as of a
+particular date following the ``<major>.<minor>.<patch>`` feature
+release.
+
+Individual component values are also available in variables:
+
+* :variable:`CMAKE_MAJOR_VERSION`
+* :variable:`CMAKE_MINOR_VERSION`
+* :variable:`CMAKE_PATCH_VERSION`
+* :variable:`CMAKE_TWEAK_VERSION`
+
+.. note::
+
+ CMake versions prior to 2.8.2 used three components for the
+ feature level and had no bug-fix component. Release versions
+ used an even-valued second component, i.e.
+ ``<major>.<even-minor>.<patch>[-rc<n>]``. Development versions
+ used an odd-valued second component with the development date as
+ the third component, i.e. ``<major>.<odd-minor>.<date>``.
+
+ The ``CMAKE_VERSION`` variable is defined by CMake 2.6.3 and higher.
+ Earlier versions defined only the individual component variables.
-----------------------------------------------------------------------
Summary of changes:
Help/variable/CMAKE_MAJOR_VERSION.rst | 5 ++--
Help/variable/CMAKE_MINOR_VERSION.rst | 5 ++--
Help/variable/CMAKE_PATCH_VERSION.rst | 5 ++--
Help/variable/CMAKE_TWEAK_VERSION.rst | 7 ++----
Help/variable/CMAKE_VERSION.rst | 42 ++++++++++++++++++++++++++++-----
5 files changed, 44 insertions(+), 20 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list