diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-12 14:51:37 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-01-12 14:51:42 (GMT) |
| commit | 46ad7215979cd60c00589f6f0abdcff2856069e8 (patch) | |
| tree | 887bbce2d77e35a7371ae003baec6155b3d14c01 /Source | |
| parent | af56d7f5999a1ead7916fa6e65ed8db88b1f5ab7 (diff) | |
| parent | dcc606ad47d61ab37e7ab520aafabc9731f088f1 (diff) | |
| download | CMake-46ad7215979cd60c00589f6f0abdcff2856069e8.zip CMake-46ad7215979cd60c00589f6f0abdcff2856069e8.tar.gz CMake-46ad7215979cd60c00589f6f0abdcff2856069e8.tar.bz2 | |
Merge topic 'cuda_allow_G_to_device_debugging_on_msvc'
dcc606ad CUDA: Allow -G to control device debuging on MSVC.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1619
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index f997a11..ee9db43 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2640,6 +2640,12 @@ bool cmVisualStudio10TargetGenerator::ComputeCudaOptions( cudaOptions.Parse(defineFlags.c_str()); cudaOptions.ParseFinish(); + // If we haven't explicitly enabled GPU debug information + // explicitly disable it + if (!cudaOptions.HasFlag("GPUDebugInfo")) { + cudaOptions.AddFlag("GPUDebugInfo", "false"); + } + if (this->GeneratorTarget->GetPropertyAsBool("CUDA_SEPARABLE_COMPILATION")) { cudaOptions.AddFlag("GenerateRelocatableDeviceCode", "true"); } else if (this->GeneratorTarget->GetPropertyAsBool( |