diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-10 12:57:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-07-10 12:57:47 (GMT) |
| commit | e902a111182b27058cdea9d3f71b3fcb4d729476 (patch) | |
| tree | ae1b7ac92350cdf114aa73fe0c25890b931b1cf7 | |
| parent | 844536f681126fcb844c769224b6e690238d5589 (diff) | |
| parent | 88954496488e5b41b599d580d8b673168295d841 (diff) | |
| download | CMake-e902a111182b27058cdea9d3f71b3fcb4d729476.zip CMake-e902a111182b27058cdea9d3f71b3fcb4d729476.tar.gz CMake-e902a111182b27058cdea9d3f71b3fcb4d729476.tar.bz2 | |
Merge branch 'cuda-imported-library-device-linking' into release-3.15
Merge-request: !3526
| -rw-r--r-- | Source/cmLinkLineDeviceComputer.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Source/cmLinkLineDeviceComputer.cxx b/Source/cmLinkLineDeviceComputer.cxx index d27da3e..8d2add6 100644 --- a/Source/cmLinkLineDeviceComputer.cxx +++ b/Source/cmLinkLineDeviceComputer.cxx @@ -90,12 +90,17 @@ std::string cmLinkLineDeviceComputer::ComputeLinkLibraries( } if (item.Target) { - bool skip = true; - if (item.Target->GetType() == cmStateEnums::STATIC_LIBRARY) { - if ((!item.Target->GetPropertyAsBool("CUDA_RESOLVE_DEVICE_SYMBOLS")) && - item.Target->GetPropertyAsBool("CUDA_SEPARABLE_COMPILATION")) { - skip = false; - } + bool skip = false; + switch (item.Target->GetType()) { + case cmStateEnums::MODULE_LIBRARY: + case cmStateEnums::INTERFACE_LIBRARY: + skip = true; + break; + case cmStateEnums::STATIC_LIBRARY: + skip = item.Target->GetPropertyAsBool("CUDA_RESOLVE_DEVICE_SYMBOLS"); + break; + default: + break; } if (skip) { continue; |