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

Merge branch 'backport-cuda-non-device-link'

Browse Source
This commit is contained in:
Brad King
2020-02-24 13:33:54 -05:00
parent 125f0451a9 738f3f23aa
commit 7da2c8c543
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Compiler/NVIDIA-CUDA.cmake
View File

@@ -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()

4
Source/cmNinjaNormalTargetGenerator.cxx
View File

@@ -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 = "@";
}