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

cmGlobalGenerator: Fill the project map at compute time.

Browse Source
This commit is contained in:
Stephen Kelly 2015-08-02 12:55:05 +02:00
parent ebf8d0a99a
commit 357bf469c7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmGlobalGenerator.cxx
View File

@ -1158,10 +1158,6 @@ void cmGlobalGenerator::Configure()
// and for infinite loops // and for infinite loops
this->CheckTargetProperties(); this->CheckTargetProperties();
// at this point this->LocalGenerators has been filled,
// so create the map from project name to vector of local generators
this->FillProjectMap();
if ( this->CMakeInstance->GetWorkingMode() == cmake::NORMAL_MODE) if ( this->CMakeInstance->GetWorkingMode() == cmake::NORMAL_MODE)
{ {
std::ostringstream msg; std::ostringstream msg;
@ -1268,6 +1264,10 @@ bool cmGlobalGenerator::Compute()
this->CreateGenerationObjects(); this->CreateGenerationObjects();
// at this point this->LocalGenerators has been filled,
// so create the map from project name to vector of local generators
this->FillProjectMap();
#ifdef CMAKE_BUILD_WITH_CMAKE #ifdef CMAKE_BUILD_WITH_CMAKE
// Iterate through all targets and set up automoc for those which have // Iterate through all targets and set up automoc for those which have
// the AUTOMOC, AUTOUIC or AUTORCC property set // the AUTOMOC, AUTOUIC or AUTORCC property set