summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-08-02 10:08:49 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-08-28 16:44:39 (GMT)
commitbd096d30e05fe66a0bf702fe7e366b0042ea14ae (patch)
tree140241b59b89c5d757bd7ff30df91c38b71607f5
parentff8ac8ee6ab3ee686621445456a765fa33c1a873 (diff)
downloadCMake-bd096d30e05fe66a0bf702fe7e366b0042ea14ae.zip
CMake-bd096d30e05fe66a0bf702fe7e366b0042ea14ae.tar.gz
CMake-bd096d30e05fe66a0bf702fe7e366b0042ea14ae.tar.bz2
cmGlobalGenerator: Avoid cmLocalGenerator until after Configure.
-rw-r--r--Source/cmGlobalGenerator.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d82c7f3..ac1c119 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1134,17 +1134,17 @@ void cmGlobalGenerator::Configure()
this->LocalGenerators.push_back(lg);
// set the Start directories
- lg->GetMakefile()->SetCurrentSourceDirectory
+ dirMf->SetCurrentSourceDirectory
(this->CMakeInstance->GetHomeDirectory());
- lg->GetMakefile()->SetCurrentBinaryDirectory
+ dirMf->SetCurrentBinaryDirectory
(this->CMakeInstance->GetHomeOutputDirectory());
this->BinaryDirectories.insert(
this->CMakeInstance->GetHomeOutputDirectory());
// now do it
- lg->GetMakefile()->Configure();
- lg->GetMakefile()->EnforceDirectoryLevelRules();
+ dirMf->Configure();
+ dirMf->EnforceDirectoryLevelRules();
// update the cache entry for the number of local generators, this is used
// for progress