[Cmake-commits] CMake branch, master, updated. v3.12.0-rc2-113-g8ad3396

[Kitware Robot]

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, master has been updated
       via  8ad33961582bd0a70bf8226558c28fb3829b99a7 (commit)
       via  19f338109d8909feba37513285afe4a583811d54 (commit)
      from  752c2721a17e95f642874562f6b406f1f05b4430 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ad33961582bd0a70bf8226558c28fb3829b99a7
commit 8ad33961582bd0a70bf8226558c28fb3829b99a7
Merge: 752c272 19f3381
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 2 15:48:51 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jul 2 11:48:56 2018 -0400

    Merge topic 'policy_max_docs'
    
    19f338109d Help: Clarify ...<max> behavior for policy-related commands
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2180


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19f338109d8909feba37513285afe4a583811d54
commit 19f338109d8909feba37513285afe4a583811d54
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Sun Jul 1 08:05:01 2018 +1000
Commit:     Craig Scott <craig.scott at crascit.com>
CommitDate: Mon Jul 2 08:41:46 2018 +1000

    Help: Clarify ...<max> behavior for policy-related commands
    
    Affects cmake_minimum_required() and cmake_policy(VERSION)

diff --git a/Help/command/cmake_minimum_required.rst b/Help/command/cmake_minimum_required.rst
index 7c02190..2f1ab60 100644
--- a/Help/command/cmake_minimum_required.rst
+++ b/Help/command/cmake_minimum_required.rst
@@ -13,6 +13,10 @@ If the running version of CMake is lower than the ``<min>`` required
 version it will stop processing the project and report an error.
 The optional ``<max>`` version, if specified, must be at least the
 ``<min>`` version and affects policy settings as described below.
+If the running version of CMake is older than 3.12, the extra ``...``
+dots will be seen as version component separators, resulting in the
+``...<max>`` part being ignored and preserving the pre-3.12 behavior
+of basing policies on ``<min>``.
 
 The ``FATAL_ERROR`` option is accepted but ignored by CMake 2.6 and
 higher.  It should be specified so CMake versions 2.4 and lower fail
diff --git a/Help/command/cmake_policy.rst b/Help/command/cmake_policy.rst
index 6a8dd62..c3f7cfb 100644
--- a/Help/command/cmake_policy.rst
+++ b/Help/command/cmake_policy.rst
@@ -30,7 +30,10 @@ encourage projects to set policies based on CMake versions::
 ``major.minor[.patch[.tweak]]``, and the ``...`` is literal.  The ``<min>``
 version must be at least ``2.4`` and at most the running version of CMake.
 The ``<max>`` version, if specified, must be at least the ``<min>`` version
-but may exceed the running version of CMake.
+but may exceed the running version of CMake.  If the running version of
+CMake is older than 3.12, the extra ``...`` dots will be seen as version
+component separators, resulting in the ``...<max>`` part being ignored and
+preserving the pre-3.12 behavior of basing policies on ``<min>``.
 
 This specifies that the current CMake code is written for the given
 range of CMake versions.  All policies known to the running version of CMake
diff --git a/Help/release/3.12.rst b/Help/release/3.12.rst
index 4d1135e..79ebc8e 100644
--- a/Help/release/3.12.rst
+++ b/Help/release/3.12.rst
@@ -34,7 +34,8 @@ Commands
 * The :command:`cmake_minimum_required` and :command:`cmake_policy(VERSION)`
   commands now accept a version range using the form ``<min>[...<max>]``.
   The ``<min>`` version is required but policies are set based on the
-  ``<max>`` version.  This allows projects to specify a range of versions
+  older of the running CMake version and the version specified by
+  ``<max>``.  This allows projects to specify a range of versions
   for which they have been updated and avoid explicit policy settings.
 
 * The :command:`file(GLOB)` and :command:`file(GLOB_RECURSE)` commands

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

Summary of changes:
 Help/command/cmake_minimum_required.rst | 4 ++++
 Help/command/cmake_policy.rst           | 5 ++++-
 Help/release/3.12.rst                   | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake