cmMakefile: Internalize setting of CMakeInstance on Properties.
This commit is contained in:
parent
7bb4e3db06
commit
fca2b542b4
|
@ -252,7 +252,6 @@ void cmLocalGenerator::SetGlobalGenerator(cmGlobalGenerator *gg)
|
||||||
this->Makefile->SetLocalGenerator(this);
|
this->Makefile->SetLocalGenerator(this);
|
||||||
|
|
||||||
// setup the home directories
|
// setup the home directories
|
||||||
this->Makefile->GetProperties().SetCMakeInstance(gg->GetCMakeInstance());
|
|
||||||
this->Makefile->SetHomeDirectory(
|
this->Makefile->SetHomeDirectory(
|
||||||
gg->GetCMakeInstance()->GetHomeDirectory());
|
gg->GetCMakeInstance()->GetHomeDirectory());
|
||||||
this->Makefile->SetHomeOutputDirectory(
|
this->Makefile->SetHomeOutputDirectory(
|
||||||
|
|
|
@ -741,6 +741,7 @@ void cmMakefile::SetLocalGenerator(cmLocalGenerator* lg)
|
||||||
this->AddSourceGroup("Object Files", "\\.(lo|o|obj)$");
|
this->AddSourceGroup("Object Files", "\\.(lo|o|obj)$");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
this->Properties.SetCMakeInstance(this->GetCMakeInstance());
|
||||||
this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused();
|
this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused();
|
||||||
this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars();
|
this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue