kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makefile: Rename linker response file boolean to be more specific 

Rename local variable useResponseFile to useResponseFileForObjects
when it represents CMAKE_<LANG>_USE_RESPONSE_FILE_FOR_OBJECTS.
This commit is contained in:
Brad King 2014-03-04 13:21:15 -05:00
parent 5e8e4d0f88
commit 745caae6dd
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmMakefileExecutableTargetGenerator.cxx
View File

@ -307,14 +307,14 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
} }
// Select whether to use a response file for objects. // Select whether to use a response file for objects.
bool useResponseFile = false; bool useResponseFileForObjects = false;
{ {
std::string responseVar = "CMAKE_"; std::string responseVar = "CMAKE_";
responseVar += linkLanguage; responseVar += linkLanguage;
responseVar += "_USE_RESPONSE_FILE_FOR_OBJECTS"; responseVar += "_USE_RESPONSE_FILE_FOR_OBJECTS";
if(this->Makefile->IsOn(responseVar.c_str())) if(this->Makefile->IsOn(responseVar.c_str()))
{ {
useResponseFile = true; useResponseFileForObjects = true;
} }
} }
@ -330,8 +330,8 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
// Construct object file lists that may be needed to expand the // Construct object file lists that may be needed to expand the
// rule. // rule.
std::string buildObjs; std::string buildObjs;
this->CreateObjectLists(useLinkScript, false, useResponseFile, this->CreateObjectLists(useLinkScript, false,
buildObjs, depends); useResponseFileForObjects, buildObjs, depends);
cmLocalGenerator::RuleVariables vars; cmLocalGenerator::RuleVariables vars;
vars.RuleLauncher = "RULE_LAUNCH_LINK"; vars.RuleLauncher = "RULE_LAUNCH_LINK";

10
Source/cmMakefileLibraryTargetGenerator.cxx
View File

@ -474,14 +474,14 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
bool useLinkScript = this->GlobalGenerator->GetUseLinkScript(); bool useLinkScript = this->GlobalGenerator->GetUseLinkScript();
// Select whether to use a response file for objects. // Select whether to use a response file for objects.
bool useResponseFile = false; bool useResponseFileForObjects = false;
{ {
std::string responseVar = "CMAKE_"; std::string responseVar = "CMAKE_";
responseVar += linkLanguage; responseVar += linkLanguage;
responseVar += "_USE_RESPONSE_FILE_FOR_OBJECTS"; responseVar += "_USE_RESPONSE_FILE_FOR_OBJECTS";
if(this->Makefile->IsOn(responseVar.c_str())) if(this->Makefile->IsOn(responseVar.c_str()))
{ {
useResponseFile = true; useResponseFileForObjects = true;
} }
} }
@ -528,7 +528,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
useLinkScript = true; useLinkScript = true;
// Archiving rules never use a response file. // Archiving rules never use a response file.
useResponseFile = false; useResponseFileForObjects = false;
// Limit the length of individual object lists to less than the // Limit the length of individual object lists to less than the
// 32K command line length limit on Windows. We could make this a // 32K command line length limit on Windows. We could make this a
@ -552,8 +552,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
// Construct object file lists that may be needed to expand the // Construct object file lists that may be needed to expand the
// rule. // rule.
std::string buildObjs; std::string buildObjs;
this->CreateObjectLists(useLinkScript, useArchiveRules, useResponseFile, this->CreateObjectLists(useLinkScript, useArchiveRules,
buildObjs, depends); useResponseFileForObjects, buildObjs, depends);
cmLocalGenerator::RuleVariables vars; cmLocalGenerator::RuleVariables vars;
vars.TargetPDB = targetOutPathPDB.c_str(); vars.TargetPDB = targetOutPathPDB.c_str();