Просмотр исходного кода

Merge topic 'Help-CMP0105-clarifications' into release-3.26

afd40232fa Help: CMP0105 policy: clarifications

Acked-by: Kitware Robot <[email protected]>
Merge-request: !8418
Marc Chevrier 2 лет назад
Родитель
Сommit
32c3dbbee8
1 измененных файлов с 3 добавлено и 2 удалено
  1. 3 2
      Help/policy/CMP0105.rst

+ 3 - 2
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.