summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorRobert Maynard <robert.maynard@kitware.com>2019-08-06 19:04:59 (GMT)
committerRobert Maynard <robert.maynard@kitware.com>2019-08-06 19:44:15 (GMT)
commita233e4e7d9c157cae0098762d8a7add463fb3492 (patch)
tree15b5bf844956643db07ed0f9de74f5a6b60b0bad /Source
parentfdaad9a067e8fa55816d9cef2481450fc5b1f18b (diff)
downloadCMake-a233e4e7d9c157cae0098762d8a7add463fb3492.zip
CMake-a233e4e7d9c157cae0098762d8a7add463fb3492.tar.gz
CMake-a233e4e7d9c157cae0098762d8a7add463fb3492.tar.bz2
CUDA: Compilers can now state they don't require a device linking step
Diffstat (limited to 'Source')
-rw-r--r--Source/cmLinkLineDeviceComputer.cxx5
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