diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2019-08-13 13:55:50 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-13 13:56:47 (GMT) |
| commit | dabd16926b52d9bd3ddb96edc515ff7ce7f1b4d5 (patch) | |
| tree | b9cdecdc1d2ab007f5b628b5ea27497702f490f6 /Source | |
| parent | f952d9c2573cd243e89f466ec79e9b7dbad9fd06 (diff) | |
| parent | a233e4e7d9c157cae0098762d8a7add463fb3492 (diff) | |
| download | CMake-dabd16926b52d9bd3ddb96edc515ff7ce7f1b4d5.zip CMake-dabd16926b52d9bd3ddb96edc515ff7ce7f1b4d5.tar.gz CMake-dabd16926b52d9bd3ddb96edc515ff7ce7f1b4d5.tar.bz2 | |
Merge topic 'cuda_separable_compilation_determined_by_compiler_id'
a233e4e7d9 CUDA: Compilers can now state they don't require a device linking step
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3659
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLinkLineDeviceComputer.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmLinkLineDeviceComputer.cxx b/Source/cmLinkLineDeviceComputer.cxx index 656907a..7cacb24 100644 --- a/Source/cmLinkLineDeviceComputer.cxx +++ b/Source/cmLinkLineDeviceComputer.cxx @@ -13,6 +13,7 @@ #include "cmGeneratorTarget.h" #include "cmGlobalGenerator.h" #include "cmLocalGenerator.h" +#include "cmMakefile.h" #include "cmStateDirectory.h" #include "cmStateSnapshot.h" #include "cmStateTypes.h" @@ -156,6 +157,10 @@ bool requireDeviceLinking(cmGeneratorTarget& target, cmLocalGenerator& lg, return false; } + if (!lg.GetMakefile()->IsOn("CMAKE_CUDA_COMPILER_HAS_DEVICE_LINK_PHASE")) { + return false; + } + if (const char* resolveDeviceSymbols = target.GetProperty("CUDA_RESOLVE_DEVICE_SYMBOLS")) { // If CUDA_RESOLVE_DEVICE_SYMBOLS has been explicitly set we need |