diff options
| author | Brad King <brad.king@kitware.com> | 2022-01-28 14:40:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-01-28 14:40:50 (GMT) |
| commit | ba069c10dd6a52e58b2a846136fbfa6846aec971 (patch) | |
| tree | 0f88842ad8ca642f8439cac5b483c1ee42c0a48a /Source | |
| parent | 4ff6ea0f2fcbac87c3317623e7de41cdd506ab17 (diff) | |
| parent | daf372c4d686000fd2c6f380efa7f5ddfd915ceb (diff) | |
| download | CMake-ba069c10dd6a52e58b2a846136fbfa6846aec971.zip CMake-ba069c10dd6a52e58b2a846136fbfa6846aec971.tar.gz CMake-ba069c10dd6a52e58b2a846136fbfa6846aec971.tar.bz2 | |
Merge topic 'cuda_vs_arch_all'
daf372c4d6 CUDA: Fix issuing error if default architecture detection fails
7a0d098352 CUDA: Error on empty/invalid CMAKE_CUDA_ARCHITECTURES set by user
d19273bc7b CUDA: Support all and all-major on Visual Studio
5f667d783a CUDA: Actually use reverse architecture deprecation order for Clang
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !6912
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudioGeneratorOptions.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx index 5c17a07..9045a4d 100644 --- a/Source/cmVisualStudioGeneratorOptions.cxx +++ b/Source/cmVisualStudioGeneratorOptions.cxx @@ -182,6 +182,10 @@ void cmVisualStudioGeneratorOptions::FixCudaCodeGeneration() // First entries for the -arch=<arch> [-code=<code>,...] pair. if (!arch.empty()) { std::string arch_name = arch[0]; + if (arch_name == "all" || arch_name == "all-major") { + AppendFlagString("AdditionalOptions", "-arch=" + arch_name); + return; + } std::vector<std::string> codes; if (!code.empty()) { codes = cmTokenize(code[0], ","); |