diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-13 13:18:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-13 13:18:19 (GMT) |
| commit | 087b8ccda98af32480657d2e54b5395aac3b413f (patch) | |
| tree | 786571374c239409b24edfa85c69f00c5e3a60aa /Source | |
| parent | 4ba2d2e3d76cb1ec04c612f9646c47d3f1231ad2 (diff) | |
| parent | 7368ade2502a347b18c47fc175b67c1d0f594744 (diff) | |
| download | CMake-087b8ccda98af32480657d2e54b5395aac3b413f.zip CMake-087b8ccda98af32480657d2e54b5395aac3b413f.tar.gz CMake-087b8ccda98af32480657d2e54b5395aac3b413f.tar.bz2 | |
Merge topic 'cuda-dlink-no-deprecated-gpu'
7368ade2 CUDA: When linking device code suppress CUDA 8.0+ deprecation warnings
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !951
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 46c2894..29a06b7 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2591,6 +2591,13 @@ bool cmVisualStudio10TargetGenerator::ComputeCudaLinkOptions( cudaLinkOptions.AddFlag("PerformDeviceLink", doDeviceLinking ? "true" : "false"); + // Suppress deprecation warnings for default GPU targets during device link. + if (cmSystemTools::VersionCompareGreaterEq( + this->GlobalGenerator->GetPlatformToolsetCudaString(), "8.0")) { + cudaLinkOptions.AppendFlag("AdditionalOptions", + "-Wno-deprecated-gpu-targets"); + } + this->CudaLinkOptions[configName] = pOptions.release(); return true; } |