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

cmMakefile: Populate Home directories on initialize.

Browse Source
This commit is contained in:
Stephen Kelly 2015-04-16 21:47:14 +02:00
parent 8878bea7b6
commit fcf246acd1
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalGenerator.cxx
View File

@ -250,12 +250,6 @@ void cmLocalGenerator::SetGlobalGenerator(cmGlobalGenerator *gg)
this->GlobalGenerator = gg; this->GlobalGenerator = gg;
this->Makefile = new cmMakefile; this->Makefile = new cmMakefile;
this->Makefile->SetLocalGenerator(this); this->Makefile->SetLocalGenerator(this);
// setup the home directories
this->Makefile->SetHomeDirectory(
gg->GetCMakeInstance()->GetHomeDirectory());
this->Makefile->SetHomeOutputDirectory(
gg->GetCMakeInstance()->GetHomeOutputDirectory());
} }
void cmLocalGenerator::ConfigureFinalPass() void cmLocalGenerator::ConfigureFinalPass()

3
Source/cmMakefile.cxx
View File

@ -696,6 +696,9 @@ void cmMakefile::SetLocalGenerator(cmLocalGenerator* lg)
this->Properties.SetCMakeInstance(this->GetCMakeInstance()); 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();
this->SetHomeDirectory(this->GetCMakeInstance()->GetHomeDirectory());
this->SetHomeOutputDirectory(
this->GetCMakeInstance()->GetHomeOutputDirectory());
} }
namespace namespace