diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-24 18:35:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-02-24 18:35:51 (GMT) |
| commit | 553c45447767b4ff7102ce1c15cf140667f748c0 (patch) | |
| tree | 91d70e878b22961cf678563eef9901658caca8aa | |
| parent | 8871cb57e28516d75326afd0d22ff5a2c576a43b (diff) | |
| parent | 738f3f23aa50749f27a0ee6ea61e7e0f7e52313a (diff) | |
| download | CMake-553c45447767b4ff7102ce1c15cf140667f748c0.zip CMake-553c45447767b4ff7102ce1c15cf140667f748c0.tar.gz CMake-553c45447767b4ff7102ce1c15cf140667f748c0.tar.bz2 | |
Merge branch 'backport-cuda-non-device-link' into release-3.15
Merge-request: !4376
| -rw-r--r-- | Modules/Compiler/NVIDIA-CUDA.cmake | 2 | ||||
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Modules/Compiler/NVIDIA-CUDA.cmake b/Modules/Compiler/NVIDIA-CUDA.cmake index c0ccb71..b71724c 100644 --- a/Modules/Compiler/NVIDIA-CUDA.cmake +++ b/Modules/Compiler/NVIDIA-CUDA.cmake @@ -42,6 +42,6 @@ set(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_LIBRARIES 0) set(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_OBJECTS 0) if (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "9.0") - set(CMAKE_CUDA_RESPONSE_FILE_LINK_FLAG "--options-file ") + set(CMAKE_CUDA_RESPONSE_FILE_DEVICE_LINK_FLAG "--options-file ") set(CMAKE_CUDA_RESPONSE_FILE_FLAG "--options-file ") endif() diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index b7b822a..28c0787 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -174,7 +174,7 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkRule(bool useResponseFile) // build response file name std::string responseFlag = this->GetMakefile()->GetSafeDefinition( - "CMAKE_CUDA_RESPONSE_FILE_LINK_FLAG"); + "CMAKE_CUDA_RESPONSE_FILE_DEVICE_LINK_FLAG"); if (!useResponseFile || responseFlag.empty()) { vars.Objects = "$in"; @@ -290,7 +290,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkRule(bool useResponseFile) if (flag) { responseFlag = flag; - } else if (this->TargetLinkLanguage != "CUDA") { + } else { responseFlag = "@"; } |