summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorMarc Chevrier <marc.chevrier@gmail.com>2021-06-29 11:41:10 (GMT)
committerMarc Chevrier <marc.chevrier@gmail.com>2021-06-29 11:41:10 (GMT)
commit616972197a21ec94504c1fa40f8608d430325eac (patch)
tree9f3eba4060b53ce792740ae0a7e85537a2e1ac86 /Help
parent06d2c3fce453365e36fc3d3c483bc9130268c7d9 (diff)
parent16208ac1132b5624743c3ea534f610541d90ab8f (diff)
downloadCMake-616972197a21ec94504c1fa40f8608d430325eac.zip
CMake-616972197a21ec94504c1fa40f8608d430325eac.tar.gz
CMake-616972197a21ec94504c1fa40f8608d430325eac.tar.bz2
Merge branch 'backport-3.21-CMP0126-WARNING' into CMP0126-WARNING
Diffstat (limited to 'Help')
-rw-r--r--Help/policy/CMP0126.rst4
-rw-r--r--Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst2
2 files changed, 5 insertions, 1 deletions
diff --git a/Help/policy/CMP0126.rst b/Help/policy/CMP0126.rst
index 4c8e928..0ced8fa 100644
--- a/Help/policy/CMP0126.rst
+++ b/Help/policy/CMP0126.rst
@@ -15,6 +15,8 @@ behavior for this policy is to keep the normal variable of the same name.
This policy was introduced in CMake version 3.21. Use the
:command:`cmake_policy` command to set it to ``OLD`` or ``NEW`` explicitly.
Unlike many policies, CMake version |release| does *not* warn when the policy
-is not set and simply uses ``OLD`` behavior.
+is not set and simply uses ``OLD`` behavior. See documentation of the
+:variable:`CMAKE_POLICY_WARNING_CMP0126 <CMAKE_POLICY_WARNING_CMP<NNNN>>`
+variable to control the warning.
.. include:: DEPRECATED.txt
diff --git a/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst b/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst
index 9f68741..b991db2 100644
--- a/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst
+++ b/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst
@@ -29,6 +29,8 @@ warn by default:
policy :policy:`CMP0112`.
* ``CMAKE_POLICY_WARNING_CMP0116`` controls the warning for
policy :policy:`CMP0116`.
+* ``CMAKE_POLICY_WARNING_CMP0126`` controls the warning for
+ policy :policy:`CMP0126`.
This variable should not be set by a project in CMake code. Project
developers running CMake may set this variable in their cache to