diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-25 13:54:35 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-02-25 13:54:45 (GMT) |
| commit | 1d338dcf4654c278ac3375e15b6ef5ea7360fb7b (patch) | |
| tree | 520e2121fe6b578e6d3489d37fac4960dcb91e5b | |
| parent | 8d6ea4401c8fc4c18d070378fc5284b93c311d3a (diff) | |
| parent | 7da2c8c543b7f8ffc1afe1b1cc4d11d60e9db3a4 (diff) | |
| download | CMake-1d338dcf4654c278ac3375e15b6ef5ea7360fb7b.zip CMake-1d338dcf4654c278ac3375e15b6ef5ea7360fb7b.tar.gz CMake-1d338dcf4654c278ac3375e15b6ef5ea7360fb7b.tar.bz2 | |
Merge topic 'cuda-non-device-link' into release-3.17
7da2c8c543 Merge branch 'backport-cuda-non-device-link'
738f3f23aa Ninja: Do not use nvcc response files with non-nvcc tools
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
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 a786fb9..1f4d54d 100644 --- a/Modules/Compiler/NVIDIA-CUDA.cmake +++ b/Modules/Compiler/NVIDIA-CUDA.cmake @@ -82,7 +82,7 @@ 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 ff79a17..0a6da91 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -197,7 +197,7 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkRule( // 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"; @@ -311,7 +311,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkRule(bool useResponseFile, if (flag) { responseFlag = flag; - } else if (this->TargetLinkLanguage(config) != "CUDA") { + } else { responseFlag = "@"; } |