mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'support_nvcc_native_flag'

Browse Source 
14d8a2768d CUDA: Support nvcc 11.5 new -arch=all|all-major flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6652
This commit is contained in:
Brad King
2021-11-02 12:54:57 +00:00
committed by Kitware Robot
parent d273175157 14d8a2768d
commit 4e84a4763d
7 changed files with 117 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/cmGeneratorTarget.cxx
View File

@@ -3465,6 +3465,22 @@ void cmGeneratorTarget::AddCUDAArchitectureFlags(std::string& flags) const
return;
}
std::string const& compiler =
this->Makefile->GetSafeDefinition("CMAKE_CUDA_COMPILER_ID");
// Check for special modes: `all`, `all-major`.
if (property == "all") {
if (compiler == "NVIDIA") {
flags += " -arch=all";
return;
}
} else if (property == "all-major") {
if (compiler == "NVIDIA") {
flags += " -arch=all-major";
return;
}
}
struct CudaArchitecture
{
std::string name;
@@ -3506,9 +3522,6 @@ void cmGeneratorTarget::AddCUDAArchitectureFlags(std::string& flags) const
}
}
std::string const& compiler =
this->Makefile->GetSafeDefinition("CMAKE_CUDA_COMPILER_ID");
if (compiler == "NVIDIA") {
for (CudaArchitecture& architecture : architectures) {
flags +=