kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGlobalGenerator: Create local generator after configuring the makefile.

This commit is contained in:
Stephen Kelly 2015-09-13 20:32:33 +02:00
parent 8a88089bbe
commit dd408de46b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGlobalGenerator.cxx
View File

@ -1099,8 +1099,6 @@ void cmGlobalGenerator::Configure()
cmMakefile* dirMf = cmMakefile* dirMf =
new cmMakefile(this, this->GetCMakeInstance()->GetCurrentSnapshot()); new cmMakefile(this, this->GetCMakeInstance()->GetCurrentSnapshot());
this->Makefiles.push_back(dirMf); this->Makefiles.push_back(dirMf);
cmLocalGenerator *lg = this->CreateLocalGenerator(dirMf);
this->LocalGenerators.push_back(lg);
// set the Start directories // set the Start directories
dirMf->SetCurrentSourceDirectory dirMf->SetCurrentSourceDirectory
@ -1114,6 +1112,8 @@ void cmGlobalGenerator::Configure()
// now do it // now do it
this->ConfigureDoneCMP0026 = false; this->ConfigureDoneCMP0026 = false;
dirMf->Configure(); dirMf->Configure();
this->LocalGenerators.insert(this->LocalGenerators.begin(),
this->CreateLocalGenerator(dirMf));
dirMf->EnforceDirectoryLevelRules(); dirMf->EnforceDirectoryLevelRules();
this->ConfigureDoneCMP0026 = true; this->ConfigureDoneCMP0026 = true;