summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-04-27 13:01:56 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-04-27 13:02:00 (GMT)
commit7402bd38714e7930810f6bd61e20b836268be814 (patch)
tree49dbac3b900ec7ea171ad978e11fa921ff0be05b /Help/manual
parentf38147aebc19cdca17df101a9ca6a10337508485 (diff)
parent493671a5212c6548b2d7376c7065f5f76692a792 (diff)
downloadCMake-7402bd38714e7930810f6bd61e20b836268be814.zip
CMake-7402bd38714e7930810f6bd61e20b836268be814.tar.gz
CMake-7402bd38714e7930810f6bd61e20b836268be814.tar.bz2
Merge topic 'cuda-device-link-ar'
493671a5 CUDA: Static libraries can now explicitly resolve device symbols 8fb85c68 CUDA: Makefile uses relative path for device linking status messages a36fb229 CUDA: Visual Studio now properly delays device linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !759
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-properties.7.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 344bc09..38cc0d8 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -154,6 +154,7 @@ Properties on Targets
/prop_tgt/CROSSCOMPILING_EMULATOR
/prop_tgt/CUDA_PTX_COMPILATION
/prop_tgt/CUDA_SEPARABLE_COMPILATION
+ /prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS
/prop_tgt/CUDA_EXTENSIONS
/prop_tgt/CUDA_STANDARD
/prop_tgt/CUDA_STANDARD_REQUIRED