diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-16 19:47:14 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-20 22:12:51 (GMT) |
| commit | fcf246acd18dd168d9909cd33b191a3e6c9881e0 (patch) | |
| tree | c77eba62753b7064f6a8c12dfbe339546e2196c7 /Source | |
| parent | 8878bea7b6a157948bb7c806523b1cfa4c9f7af8 (diff) | |
| download | CMake-fcf246acd18dd168d9909cd33b191a3e6c9881e0.zip CMake-fcf246acd18dd168d9909cd33b191a3e6c9881e0.tar.gz CMake-fcf246acd18dd168d9909cd33b191a3e6c9881e0.tar.bz2 | |
cmMakefile: Populate Home directories on initialize.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 946a020..1fd8ebb 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -250,12 +250,6 @@ void cmLocalGenerator::SetGlobalGenerator(cmGlobalGenerator *gg) this->GlobalGenerator = gg; this->Makefile = new cmMakefile; this->Makefile->SetLocalGenerator(this); - - // setup the home directories - this->Makefile->SetHomeDirectory( - gg->GetCMakeInstance()->GetHomeDirectory()); - this->Makefile->SetHomeOutputDirectory( - gg->GetCMakeInstance()->GetHomeOutputDirectory()); } void cmLocalGenerator::ConfigureFinalPass() diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 23c2e48..bc0ac26 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -696,6 +696,9 @@ void cmMakefile::SetLocalGenerator(cmLocalGenerator* lg) this->Properties.SetCMakeInstance(this->GetCMakeInstance()); this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused(); this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars(); + this->SetHomeDirectory(this->GetCMakeInstance()->GetHomeDirectory()); + this->SetHomeOutputDirectory( + this->GetCMakeInstance()->GetHomeOutputDirectory()); } namespace |