Commit 1981c971 authored by Stephen Kelly's avatar Stephen Kelly
Browse files

cmMakefile: Simplify InitializeFromParent method.

Provide a parent instead of requiring it to be computed through
the cmLocalGenerator.
parent 353e422b
......@@ -1485,10 +1485,8 @@ void cmMakefile::AddLinkDirectory(const std::string& dir)
}
}
void cmMakefile::InitializeFromParent()
void cmMakefile::InitializeFromParent(cmMakefile* parent)
{
cmMakefile *parent = this->LocalGenerator->GetParent()->GetMakefile();
// Initialize definitions with the closure of the parent scope.
this->Internal->InitializeDefinitions(parent);
......@@ -1672,7 +1670,7 @@ void cmMakefile::Configure()
void cmMakefile::ConfigureSubDirectory(cmMakefile *mf)
{
mf->InitializeFromParent();
mf->InitializeFromParent(this);
std::string currentStart = mf->GetCurrentSourceDirectory();
if (this->GetCMakeInstance()->GetDebugOutput())
{
......
......@@ -728,7 +728,7 @@ public:
cmPropertyMap &GetProperties() { return this->Properties; }
///! Initialize a makefile from its parent
void InitializeFromParent();
void InitializeFromParent(cmMakefile* parent);
void AddInstallGenerator(cmInstallGenerator* g)
{ if(g) this->InstallGenerators.push_back(g); }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment