summaryrefslogtreecommitdiff
path: root/Help
diff options
context:
space:
mode:
authorMarc Chevrier <marc.chevrier@gmail.com>2023-04-15 10:24:10 +0200
committerMarc Chevrier <marc.chevrier@gmail.com>2023-04-15 10:24:10 +0200
commitc96df3dc8b6364a743deffc744ac553a4285149b (patch)
tree43138a479ab84ac51b1250010d198a56766be5cc /Help
parent0991023c30ed5b83bcb1446b5bcc9c1eae028835 (diff)
parentafd40232faed9fc2506ff5e46d74c6d64b54c4bc (diff)
downloadcmake-c96df3dc8b6364a743deffc744ac553a4285149b.tar.gz
Merge branch 'backport-3.26-help-CMP0105' into Help-CMP0105-clarifications
Diffstat (limited to 'Help')
-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 097a59abb8..aadc8d6ee6 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.