diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-18 16:44:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-18 16:45:27 (GMT) |
| commit | c26853718ec764d02e243bb6bfdabf0f9ec3157c (patch) | |
| tree | b7c5dc959ec3da736a961cdb4a8828f694ff42de | |
| parent | 310e953d58127b554f54739535508dfe02c80de0 (diff) | |
| parent | e5279c2c8ff5432ab6cc05956bb504bebecab101 (diff) | |
| download | CMake-c26853718ec764d02e243bb6bfdabf0f9ec3157c.zip CMake-c26853718ec764d02e243bb6bfdabf0f9ec3157c.tar.gz CMake-c26853718ec764d02e243bb6bfdabf0f9ec3157c.tar.bz2 | |
Merge topic 'improve_device_link_policy_cross_ref' into release-3.18
e5279c2c8f Help: Better document that CMP0105 controls DEVICE_LINK parsing
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4919
| -rw-r--r-- | Help/command/DEVICE_LINK_OPTIONS.txt | 7 | ||||
| -rw-r--r-- | Help/manual/cmake-generator-expressions.7.rst | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Help/command/DEVICE_LINK_OPTIONS.txt b/Help/command/DEVICE_LINK_OPTIONS.txt index 012e9b1..3f0226f 100644 --- a/Help/command/DEVICE_LINK_OPTIONS.txt +++ b/Help/command/DEVICE_LINK_OPTIONS.txt @@ -1,9 +1,10 @@ When a device link step is involved, which is controlled by :prop_tgt:`CUDA_SEPARABLE_COMPILATION` and -:prop_tgt:`CUDA_RESOLVE_DEVICE_SYMBOLS` properties, the raw options will be -delivered to the host and device link steps (wrapped in ``-Xcompiler`` or -equivalent for device link). Options wrapped with ``$<DEVICE_LINK:...>`` +:prop_tgt:`CUDA_RESOLVE_DEVICE_SYMBOLS` properties and policy :policy:`CMP0105`, +the raw options will be delivered to the host and device link steps (wrapped in +``-Xcompiler`` or equivalent for device link). Options wrapped with +``$<DEVICE_LINK:...>`` :manual:`generator expression <cmake-generator-expressions(7)>` will be used only for the device link step. Options wrapped with ``$<HOST_LINK:...>`` :manual:`generator expression <cmake-generator-expressions(7)>` will be used diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst index 9e411a4..124da44 100644 --- a/Help/manual/cmake-generator-expressions.7.rst +++ b/Help/manual/cmake-generator-expressions.7.rst @@ -365,8 +365,9 @@ Variable Queries ``$<DEVICE_LINK:list>`` Returns the list if it is the device link step, an empty list otherwise. The device link step is controlled by :prop_tgt:`CUDA_SEPARABLE_COMPILATION` - and :prop_tgt:`CUDA_RESOLVE_DEVICE_SYMBOLS` properties. This expression can - only be used to specify link options. + and :prop_tgt:`CUDA_RESOLVE_DEVICE_SYMBOLS` properties and + policy :policy:`CMP0105`. This expression can only be used to specify link + options. ``$<HOST_LINK:list>`` Returns the list if it is the normal link step, an empty list otherwise. |