mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-21 03:10:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

CUDA: Restore support for non-"all" CUDA_ARCHITECTURES with nvcc 11.5+

Browse Source 
Since commit 8f64df0a7c (CUDA: Generic all and all-major support,
2021-12-19, v3.23.0-rc1~23^2), setting `CUDA_ARCHITECTURES` to a value
other than `all` or `all-major` is ignored with NVCC 11.5+.  Fix the
logic to return early only when actually using an "all" value.

Fixes: #23243
This commit is contained in:
Brad King
2022-02-18 12:39:59 -05:00
parent a1cb448580
commit f75299b803
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmGeneratorTarget.cxx
View File

@@ -3452,12 +3452,10 @@ void cmGeneratorTarget::AddCUDAArchitectureFlags(std::string& flags) const
cmSystemTools::OP_GREATER_EQUAL,
this->Makefile->GetDefinition("CMAKE_CUDA_COMPILER_VERSION"),
"11.5")) {
if (property == "all") {
flags += " -arch=all";
} else if (property == "all-major") {
flags += " -arch=all-major";
if (property == "all" || property == "all-major") {
flags = cmStrCat(flags, " -arch=", property);
return;
}
return;
}
if (property == "all") {