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

cmNinjaTargetGenerator: Factor out helper for forced response file check

Browse Source
This commit is contained in:
Dmitry Ivanov 2016-04-06 12:55:15 +02:00 committed by Brad King
parent 82c405c473
commit 24c9106b7b
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmNinjaNormalTargetGenerator.cxx
View File

@ -698,9 +698,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
cmGlobalNinjaGenerator& globalGen = *this->GetGlobalGenerator(); cmGlobalNinjaGenerator& globalGen = *this->GetGlobalGenerator();
int commandLineLengthLimit = 1; int commandLineLengthLimit = 1;
const char* forceRspFile = "CMAKE_NINJA_FORCE_RESPONSE_FILE"; if (!this->ForceResponseFile())
if (!mf->IsDefinitionSet(forceRspFile) &&
cmSystemTools::GetEnv(forceRspFile) == 0)
{ {
commandLineLengthLimit = calculateCommandLineLengthLimit( commandLineLengthLimit = calculateCommandLineLengthLimit(
globalGen.GetRuleCmdLength(this->LanguageLinkerRule())); globalGen.GetRuleCmdLength(this->LanguageLinkerRule()));

7
Source/cmNinjaTargetGenerator.cxx
View File

@ -795,3 +795,10 @@ void cmNinjaTargetGenerator::addPoolNinjaVariable(
vars["pool"] = pool; vars["pool"] = pool;
} }
} }
bool cmNinjaTargetGenerator::ForceResponseFile()
{
static std::string const forceRspFile = "CMAKE_NINJA_FORCE_RESPONSE_FILE";
return (this->GetMakefile()->IsDefinitionSet(forceRspFile) ||
cmSystemTools::GetEnv(forceRspFile) != 0);
}

2
Source/cmNinjaTargetGenerator.h
View File

@ -152,6 +152,8 @@ protected:
cmGeneratorTarget* target, cmGeneratorTarget* target,
cmNinjaVars& vars); cmNinjaVars& vars);
bool ForceResponseFile();
private: private:
cmLocalNinjaGenerator* LocalGenerator; cmLocalNinjaGenerator* LocalGenerator;
/// List of object files for this target. /// List of object files for this target.