diff options
| author | Marcel Ritzschke <marcel.ritzschke@mail.de> | 2021-03-14 17:14:19 (GMT) |
|---|---|---|
| committer | Marcel Ritzschke <marcel.ritzschke@mail.de> | 2021-03-18 14:44:13 (GMT) |
| commit | c73b847b0311a0eff0eeaa113991bce0149532a7 (patch) | |
| tree | 8be2379de4ddaf5cfc5a02ea7ae33203688910ab /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 7483843816bb413b730a5df7f28f5c07a3d81ac6 (diff) | |
| download | CMake-c73b847b0311a0eff0eeaa113991bce0149532a7.zip CMake-c73b847b0311a0eff0eeaa113991bce0149532a7.tar.gz CMake-c73b847b0311a0eff0eeaa113991bce0149532a7.tar.bz2 | |
VS: switch to new folder structure while keeping the old one working
Fixes: #21170
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 965ac3e..0255d60 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -545,7 +545,7 @@ void cmVisualStudio10TargetGenerator::Generate() e1.Element( "CudaToolkitCustomDir", this->GlobalGenerator->GetPlatformToolsetCudaCustomDirString() + - "nvcc"); + this->GlobalGenerator->GetPlatformToolsetCudaNvccSubdirString()); } } @@ -654,8 +654,9 @@ void cmVisualStudio10TargetGenerator::Generate() std::string cudaPath = customDir.empty() ? "$(VCTargetsPath)\\BuildCustomizations\\" : customDir + - "CUDAVisualStudioIntegration\\extras\\" - "visual_studio_integration\\MSBuildExtensions\\"; + this->GlobalGenerator + ->GetPlatformToolsetCudaVSIntegrationSubdirString() + + "extras\\visual_studio_integration\\MSBuildExtensions\\"; Elem(e1, "Import") .Attribute("Project", std::move(cudaPath) + "CUDA " + @@ -747,8 +748,9 @@ void cmVisualStudio10TargetGenerator::Generate() std::string cudaPath = customDir.empty() ? "$(VCTargetsPath)\\BuildCustomizations\\" : customDir + - "CUDAVisualStudioIntegration\\extras\\" - "visual_studio_integration\\MSBuildExtensions\\"; + this->GlobalGenerator + ->GetPlatformToolsetCudaVSIntegrationSubdirString() + + "extras\\visual_studio_integration\\MSBuildExtensions\\"; Elem(e1, "Import") .Attribute("Project", std::move(cudaPath) + "CUDA " + |