summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-05-14 13:41:43 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-05-14 13:42:00 (GMT)
commit5a227ce805f06bf8a31cc3a47169bcf1f33bda1b (patch)
treeab722698915f42e5c5d34fd703a9438d28d74166 /Source/cmVisualStudio10TargetGenerator.cxx
parent238c4820ff19a6a6be57a4d7a4fb7be794798c60 (diff)
parenta170a59a582ec4e5d65d2e66503a3838982b7de0 (diff)
downloadCMake-5a227ce805f06bf8a31cc3a47169bcf1f33bda1b.zip
CMake-5a227ce805f06bf8a31cc3a47169bcf1f33bda1b.tar.gz
CMake-5a227ce805f06bf8a31cc3a47169bcf1f33bda1b.tar.bz2
Merge topic 'cuda-vs-cuda-device-runtime'
a170a59a58 VS: Link CUDA binaries with the device runtime library 'cudadevrt' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2062
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2d3465f..fcea48b 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3290,9 +3290,11 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions(
"CUDA") != linkClosure->Languages.end()) {
switch (this->CudaOptions[config]->GetCudaRuntime()) {
case cmVisualStudioGeneratorOptions::CudaRuntimeStatic:
+ libVec.push_back("cudadevrt.lib");
libVec.push_back("cudart_static.lib");
break;
case cmVisualStudioGeneratorOptions::CudaRuntimeShared:
+ libVec.push_back("cudadevrt.lib");
libVec.push_back("cudart.lib");
break;
case cmVisualStudioGeneratorOptions::CudaRuntimeNone: