diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-13 13:17:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-13 13:17:06 (GMT) |
| commit | fb99b0b87b616e2045e2112ec99bb9f0ff08b128 (patch) | |
| tree | d2988251c5cbe218bf1ef9576a64e754084d7b47 /Source | |
| parent | 70ec0f2ad1d4acf6c7c9ab49c756985d468a1a69 (diff) | |
| parent | 7368ade2502a347b18c47fc175b67c1d0f594744 (diff) | |
| download | CMake-fb99b0b87b616e2045e2112ec99bb9f0ff08b128.zip CMake-fb99b0b87b616e2045e2112ec99bb9f0ff08b128.tar.gz CMake-fb99b0b87b616e2045e2112ec99bb9f0ff08b128.tar.bz2 | |
Merge branch 'cuda-dlink-no-deprecated-gpu' into release-3.9
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; } |