[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7432-g0f7f9cd

[Brad King]

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  0f7f9cd00d8fe47a5e39709132b74ad68436e9ee (commit)
       via  f7e1ab1fc66f94489adfcf7dae90adffa038564e (commit)
      from  a542ffea3e34a9f62d7d73722b324483ff1ec263 (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=0f7f9cd00d8fe47a5e39709132b74ad68436e9ee
commit 0f7f9cd00d8fe47a5e39709132b74ad68436e9ee
Merge: a542ffe f7e1ab1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 5 09:23:42 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 5 09:23:42 2014 -0500

    Merge topic 'doc-version-components' into next
    
    f7e1ab1f Help: Refine wording of CMAKE_VERSION docs


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7e1ab1fc66f94489adfcf7dae90adffa038564e
commit f7e1ab1fc66f94489adfcf7dae90adffa038564e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 5 09:23:27 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 5 09:23:42 2014 -0500

    Help: Refine wording of CMAKE_VERSION docs
    
    Add a note about how to compare values.

diff --git a/Help/variable/CMAKE_VERSION.rst b/Help/variable/CMAKE_VERSION.rst
index 6f27706..6184f08 100644
--- a/Help/variable/CMAKE_VERSION.rst
+++ b/Help/variable/CMAKE_VERSION.rst
@@ -1,10 +1,10 @@
 CMAKE_VERSION
 -------------
 
-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.
+The CMake version string as up to four non-negative integer components
+separated by ``.`` and possibly followed by ``-`` and other information.
+The first three components represent the feature level and the fourth
+component represents either a bug-fix level or development date.
 
 Release versions and release candidate versions of CMake use the format::
 
@@ -27,6 +27,12 @@ Individual component values are also available in variables:
 * :variable:`CMAKE_PATCH_VERSION`
 * :variable:`CMAKE_TWEAK_VERSION`
 
+Use the :command:`if` command ``VERSION_LESS``, ``VERSION_EQUAL``, or
+``VERSION_GREATER`` operators to compare version string values against
+``CMAKE_VERSION`` using a component-wise test.  Version component
+values may be 10 or larger so do not attempt to compare version
+strings as floating-point numbers.
+
 .. note::
 
   CMake versions prior to 2.8.2 used three components for the

-----------------------------------------------------------------------

Summary of changes:
 Help/variable/CMAKE_VERSION.rst |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake