summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-02-06 11:51:22 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-02-06 11:51:30 (GMT)
commitd6729505cbc049bda35ec571a00787ac4ce62736 (patch)
treefb5e5fa146c505256dc60e9eb7e39e9f66fd9b18 /Help
parent4400ac07f7bb7da1d85244d1b5ddc2dfd75273f1 (diff)
parent850ef90a66a8f81369b3d11c74398ccaefbe5324 (diff)
downloadCMake-d6729505cbc049bda35ec571a00787ac4ce62736.zip
CMake-d6729505cbc049bda35ec571a00787ac4ce62736.tar.gz
CMake-d6729505cbc049bda35ec571a00787ac4ce62736.tar.bz2
Merge topic 'relax_CUDA_RESOLVE_DEVICE_SYMBOLS_constraints'
850ef90a66 CUDA: Honor CUDA_RESOLVE_DEVICE_SYMBOLS for more target types Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !2900
Diffstat (limited to 'Help')
-rw-r--r--Help/prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS.rst12
-rw-r--r--Help/release/dev/CUDA_RESOLVE_DEVICE_SYMBOLS.rst6
2 files changed, 15 insertions, 3 deletions
diff --git a/Help/prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS.rst b/Help/prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS.rst
index 127d79f..ef74ae2 100644
--- a/Help/prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS.rst
+++ b/Help/prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS.rst
@@ -1,12 +1,18 @@
CUDA_RESOLVE_DEVICE_SYMBOLS
---------------------------
-CUDA only: Enables device linking for the specific static library target
+CUDA only: Enables device linking for the specific library target
-If set this will enable device linking on this static library target. Normally
+If set this will enable device linking on the library target. Normally
device linking is deferred until a shared library or executable is generated,
allowing for multiple static libraries to resolve device symbols at the same
-time.
+time when they are used by a shared library or executable.
+
+By default static library targets have this property is disabled,
+while shared, module, and executable targets have this property enabled.
+
+Note that device linking is not supported for :ref:`Object Libraries`.
+
For instance:
diff --git a/Help/release/dev/CUDA_RESOLVE_DEVICE_SYMBOLS.rst b/Help/release/dev/CUDA_RESOLVE_DEVICE_SYMBOLS.rst
new file mode 100644
index 0000000..32db233
--- /dev/null
+++ b/Help/release/dev/CUDA_RESOLVE_DEVICE_SYMBOLS.rst
@@ -0,0 +1,6 @@
+CUDA_RESOLVE_DEVICE_SYMBOLS
+---------------------------
+
+* The :prop_tgt:`CUDA_RESOLVE_DEVICE_SYMBOLS` target property is now supported
+ on shared library, module library, and executable targets. Previously it was
+ only honored on static libraries.