diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-12 18:10:48 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-12 21:10:45 (GMT) |
| commit | fca2b542b43546c64aa2c474b810890e52bd0ea4 (patch) | |
| tree | 17fba723e8b8aec4c760c33cab3447bbd9ce070a /Source | |
| parent | 7bb4e3db069e06fe2eac053e329ffb9f1ea322bf (diff) | |
| download | CMake-fca2b542b43546c64aa2c474b810890e52bd0ea4.zip CMake-fca2b542b43546c64aa2c474b810890e52bd0ea4.tar.gz CMake-fca2b542b43546c64aa2c474b810890e52bd0ea4.tar.bz2 | |
cmMakefile: Internalize setting of CMakeInstance on Properties.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 1 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index e1998e4..c143bce 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -252,7 +252,6 @@ void cmLocalGenerator::SetGlobalGenerator(cmGlobalGenerator *gg) this->Makefile->SetLocalGenerator(this); // setup the home directories - this->Makefile->GetProperties().SetCMakeInstance(gg->GetCMakeInstance()); this->Makefile->SetHomeDirectory( gg->GetCMakeInstance()->GetHomeDirectory()); this->Makefile->SetHomeOutputDirectory( diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index dea9e46..35be1b7 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -741,6 +741,7 @@ void cmMakefile::SetLocalGenerator(cmLocalGenerator* lg) this->AddSourceGroup("Object Files", "\\.(lo|o|obj)$"); #endif + this->Properties.SetCMakeInstance(this->GetCMakeInstance()); this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused(); this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars(); } |