dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-03 22:30:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

CUDA: Disable support for using response files.

Browse Source
This commit is contained in:
Robert Maynard
2017-03-21 08:38:45 -04:00
parent e1adec32b8
commit feaea0658c
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmNinjaNormalTargetGenerator.cxx
View File

@@ -753,11 +753,10 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkStatement()
cmGlobalNinjaGenerator& globalGen = *this->GetGlobalGenerator(); cmGlobalNinjaGenerator& globalGen = *this->GetGlobalGenerator();
int commandLineLengthLimit = -1; // Device linking currently doesn't support response files so
if (!this->ForceResponseFile()) { // do not check if the user has explicitly forced a response file.
commandLineLengthLimit = calculateCommandLineLengthLimit( int const commandLineLengthLimit = calculateCommandLineLengthLimit(
globalGen.GetRuleCmdLength(this->LanguageLinkerDeviceRule())); globalGen.GetRuleCmdLength(this->LanguageLinkerDeviceRule()));
}
const std::string rspfile = const std::string rspfile =
std::string(cmake::GetCMakeFilesDirectoryPostSlash()) + std::string(cmake::GetCMakeFilesDirectoryPostSlash()) +
@@ -1048,8 +1047,10 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
} }
cmGlobalNinjaGenerator& globalGen = *this->GetGlobalGenerator(); cmGlobalNinjaGenerator& globalGen = *this->GetGlobalGenerator();
bool const lang_supports_response =
!(this->TargetLinkLanguage == "RC" || this->TargetLinkLanguage == "CUDA");
int commandLineLengthLimit = -1; int commandLineLengthLimit = -1;
if (!this->ForceResponseFile()) { if (!lang_supports_response || !this->ForceResponseFile()) {
commandLineLengthLimit = calculateCommandLineLengthLimit( commandLineLengthLimit = calculateCommandLineLengthLimit(
globalGen.GetRuleCmdLength(this->LanguageLinkerRule())); globalGen.GetRuleCmdLength(this->LanguageLinkerRule()));
} }

8
Source/cmNinjaTargetGenerator.cxx
View File

@@ -405,7 +405,8 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang)
std::string rspcontent; std::string rspcontent;
std::string responseFlag; std::string responseFlag;
if (lang != "RC" && this->ForceResponseFile()) { bool const lang_supports_response = !(lang == "RC" || lang == "CUDA");
if (lang_supports_response && this->ForceResponseFile()) {
rspfile = "$RSP_FILE"; rspfile = "$RSP_FILE";
responseFlag = "@" + rspfile; responseFlag = "@" + rspfile;
rspcontent = " $DEFINES $INCLUDES $FLAGS"; rspcontent = " $DEFINES $INCLUDES $FLAGS";
@@ -930,9 +931,10 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
this->SetMsvcTargetPdbVariable(vars); this->SetMsvcTargetPdbVariable(vars);
bool const isRC = (language == "RC"); bool const lang_supports_response =
!(language == "RC" || language == "CUDA");
int const commandLineLengthLimit = int const commandLineLengthLimit =
((!isRC && this->ForceResponseFile())) ? -1 : 0; ((lang_supports_response && this->ForceResponseFile())) ? -1 : 0;
std::string const rspfile = objectFileName + ".rsp"; std::string const rspfile = objectFileName + ".rsp";
this->GetGlobalGenerator()->WriteBuild( this->GetGlobalGenerator()->WriteBuild(