From dd408de46b45926f7dfdd27cabb4dce95708d011 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 13 Sep 2015 20:32:33 +0200 Subject: cmGlobalGenerator: Create local generator after configuring the makefile. --- Source/cmGlobalGenerator.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 7aa8bb6..7552c99 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1099,8 +1099,6 @@ void cmGlobalGenerator::Configure() cmMakefile* dirMf = new cmMakefile(this, this->GetCMakeInstance()->GetCurrentSnapshot()); this->Makefiles.push_back(dirMf); - cmLocalGenerator *lg = this->CreateLocalGenerator(dirMf); - this->LocalGenerators.push_back(lg); // set the Start directories dirMf->SetCurrentSourceDirectory @@ -1114,6 +1112,8 @@ void cmGlobalGenerator::Configure() // now do it this->ConfigureDoneCMP0026 = false; dirMf->Configure(); + this->LocalGenerators.insert(this->LocalGenerators.begin(), + this->CreateLocalGenerator(dirMf)); dirMf->EnforceDirectoryLevelRules(); this->ConfigureDoneCMP0026 = true; -- cgit v0.12