diff options
| author | Brad King <brad.king@kitware.com> | 2019-06-25 18:35:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-06-25 18:35:27 (GMT) |
| commit | 7113b943463d4a9c9df7d7385856394cbcfe8de7 (patch) | |
| tree | 64c33107e4b82b9cc878f0387b661c310d44bb92 | |
| parent | 9334a4b472234e24969555f191e09302cf725265 (diff) | |
| parent | eda4c43879522438622ad75a5204666011198203 (diff) | |
| download | CMake-7113b943463d4a9c9df7d7385856394cbcfe8de7.zip CMake-7113b943463d4a9c9df7d7385856394cbcfe8de7.tar.gz CMake-7113b943463d4a9c9df7d7385856394cbcfe8de7.tar.bz2 | |
Merge branch 'ninja-nvcc-rsp' into release-3.15
Merge-request: !3482
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 7ad8ab3..f65abc8 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -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"; |