summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Chevrier <marc.chevrier@gmail.com>2023-04-17 09:15:36 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-04-17 09:15:59 (GMT)
commit62967ea17859c545166273c92b3f46355e122a8f (patch)
treeaf0d4f2a51ff764c88f9b159c71f4680651b2b98
parent911b2856400aefc23c2a8c923cb3db5f88e983fc (diff)
parentc96df3dc8b6364a743deffc744ac553a4285149b (diff)
downloadCMake-62967ea17859c545166273c92b3f46355e122a8f.zip
CMake-62967ea17859c545166273c92b3f46355e122a8f.tar.gz
CMake-62967ea17859c545166273c92b3f46355e122a8f.tar.bz2
Merge topic 'Help-CMP0105-clarifications'
c96df3dc8b Merge branch 'backport-3.26-help-CMP0105' into Help-CMP0105-clarifications afd40232fa Help: CMP0105 policy: clarifications Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8418
-rw-r--r--Help/policy/CMP0105.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Help/policy/CMP0105.rst b/Help/policy/CMP0105.rst
index 097a59a..aadc8d6 100644
--- a/Help/policy/CMP0105.rst
+++ b/Help/policy/CMP0105.rst
@@ -8,12 +8,13 @@ properties are now used for the device link step.
In CMake 3.17 and below, link options are not used by the device link step.
-The ``OLD`` behavior for this policy is to ignore the link options.
+The ``OLD`` behavior for this policy is to ignore the link options during the
+device link step.
The ``NEW`` behavior of this policy is to use the link options during the
device link step.
-This policy was introduced in CMake version 3.17. Use the
+This policy was introduced in CMake version 3.18. Use the
:command:`cmake_policy` command to set it to ``OLD`` or ``NEW`` explicitly.
Unlike many policies, CMake version |release| does *not* warn
when this policy is not set and simply uses ``OLD`` behavior.