cmMakefile: Extract InitializeVarScope method.

This commit is contained in:
Stephen Kelly 2015-06-08 20:04:24 +02:00
parent 29c1385675
commit 4bbe261cd3
1 changed files with 6 additions and 1 deletions

View File

@ -55,6 +55,11 @@ public:
this->VarStack.push_back(cmDefinitions()); this->VarStack.push_back(cmDefinitions());
} }
void InitializeVarScope()
{
this->PushDefinitions();
}
void InitializeDefinitions(cmMakefile* parent) void InitializeDefinitions(cmMakefile* parent)
{ {
this->VarStack.back() = this->VarStack.back() =
@ -141,7 +146,7 @@ cmMakefile::cmMakefile(cmLocalGenerator* localGenerator)
LocalGenerator(localGenerator), LocalGenerator(localGenerator),
StateSnapshot(localGenerator->GetStateSnapshot()) StateSnapshot(localGenerator->GetStateSnapshot())
{ {
this->Internal->PushDefinitions(); this->Internal->InitializeVarScope();
this->Internal->IsSourceFileTryCompile = false; this->Internal->IsSourceFileTryCompile = false;
// Initialize these first since AddDefaultDefinitions calls AddDefinition // Initialize these first since AddDefaultDefinitions calls AddDefinition