diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-27 13:14:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-27 13:14:26 (GMT) |
| commit | 1d86103846d4e8557c3cc77d3c1f2dce9231663d (patch) | |
| tree | 1de4eb6e4c848949ad1bdaf0008456a17a3d5317 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | c24e66561356af461245a59dda8f5161399d48a6 (diff) | |
| parent | bbc1f3642cb86ce59908ee33eeb409d7921f73f8 (diff) | |
| download | CMake-1d86103846d4e8557c3cc77d3c1f2dce9231663d.zip CMake-1d86103846d4e8557c3cc77d3c1f2dce9231663d.tar.gz CMake-1d86103846d4e8557c3cc77d3c1f2dce9231663d.tar.bz2 | |
Merge branch 'vs-cuda-fix-flags' into release-3.9
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index ca8a099..de1f5b0 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2530,7 +2530,7 @@ bool cmVisualStudio10TargetGenerator::ComputeCudaOptions( cudaOptions.RemoveFlag("AdditionalCompilerOptions"); if (!aco.empty()) { aco = this->LocalGenerator->EscapeForShell(aco, false); - cudaOptions.AppendFlag("AdditionalOptions", "-Xcompiler=" + aco); + cudaOptions.AppendFlagString("AdditionalOptions", "-Xcompiler=" + aco); } } @@ -2619,8 +2619,8 @@ bool cmVisualStudio10TargetGenerator::ComputeCudaLinkOptions( // 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"); + cudaLinkOptions.AppendFlagString("AdditionalOptions", + "-Wno-deprecated-gpu-targets"); } this->CudaLinkOptions[configName] = pOptions.release(); |