Merge topic 'vs-cuda' into release-3.30

a9210a0 VS: Restore support for CUDA with no optimization flags Acked-by: Kitware Robot <[email protected]> Acked-by: Robert Maynard <[email protected]> Merge-request: !9666
Kitware · Jul 18, 2024 · 07c1287 · 07c1287
2 parents d12c3e7 + a9210a0
commit 07c1287
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3880,6 +3880,14 @@ bool cmVisualStudio10TargetGenerator::ComputeCudaOptions(
     cudaOptions.AddFlag("CudaRuntime", "None");
   }
 
+  if (this->ProjectType == VsProjectType::vcxproj && this->MSTools) {
+    // Suppress inheritance of host compiler optimization flags
+    // when the project does not specify any optimization flags for CUDA.
+    if (!cudaOptions.HasFlag("Optimization")) {
+      cudaOptions.AddFlag("Optimization", "");
+    }
+  }
+
   this->CudaOptions[configName] = std::move(pOptions);
   return true;
 }