summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-09-13 18:32:33 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-09-24 07:39:38 (GMT)
commitdd408de46b45926f7dfdd27cabb4dce95708d011 (patch)
treea0dcbfccf17cb93dfb5c33f0354cc0275e3269e2 /Source
parent8a88089bbef4d72aa2c448877637c5ab34f6907c (diff)
downloadCMake-dd408de46b45926f7dfdd27cabb4dce95708d011.zip
CMake-dd408de46b45926f7dfdd27cabb4dce95708d011.tar.gz
CMake-dd408de46b45926f7dfdd27cabb4dce95708d011.tar.bz2
cmGlobalGenerator: Create local generator after configuring the makefile.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGlobalGenerator.cxx4
1 files 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;