diff options
| author | Brad King <brad.king@kitware.com> | 2018-07-02 15:48:51 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-07-02 15:48:56 (GMT) |
| commit | 8ad33961582bd0a70bf8226558c28fb3829b99a7 (patch) | |
| tree | 2128a90cace77cf5541c4fbebdeac3d44d99c540 /Help/command | |
| parent | 752c2721a17e95f642874562f6b406f1f05b4430 (diff) | |
| parent | 19f338109d8909feba37513285afe4a583811d54 (diff) | |
| download | CMake-8ad33961582bd0a70bf8226558c28fb3829b99a7.zip CMake-8ad33961582bd0a70bf8226558c28fb3829b99a7.tar.gz CMake-8ad33961582bd0a70bf8226558c28fb3829b99a7.tar.bz2 | |
Merge topic 'policy_max_docs'
19f338109d Help: Clarify ...<max> behavior for policy-related commands
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2180
Diffstat (limited to 'Help/command')
| -rw-r--r-- | Help/command/cmake_minimum_required.rst | 4 | ||||
| -rw-r--r-- | Help/command/cmake_policy.rst | 5 |
2 files changed, 8 insertions, 1 deletions
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 |