mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 22:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ninja-nvcc-rsp'

Browse Source 
eda4c43879 Ninja: Fix CUDA device linking when using response files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3482
This commit is contained in:
Brad King
2019-06-26 11:00:55 +00:00
committed by Kitware Robot
parent b51b6cc572 eda4c43879
commit c864765496
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmNinjaNormalTargetGenerator.cxx
+2 -13
View File
@@ -171,20 +171,9 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkRule(bool useResponseFile)
vars.Language = "CUDA";
std::string responseFlag;
std::string cmakeVarLang = "CMAKE_";
cmakeVarLang += this->TargetLinkLanguage;
// build response file name
std::string cmakeLinkVar = cmakeVarLang + "_RESPONSE_FILE_LINK_FLAG";
const char* flag = GetMakefile()->GetDefinition(cmakeLinkVar);
if (flag) {
responseFlag = flag;
} else if (this->TargetLinkLanguage != "CUDA") {
responseFlag = "@";
}
std::string responseFlag = this->GetMakefile()->GetSafeDefinition(
"CMAKE_CUDA_RESPONSE_FILE_LINK_FLAG");
if (!useResponseFile || responseFlag.empty()) {
vars.Objects = "$in";