diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-02 10:55:05 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-28 16:44:39 (GMT) |
| commit | 357bf469c7a6c6adad1f3269474989af9b203994 (patch) | |
| tree | 37d3d905a8f212e6fd4c86492bcd8dad51b28a6a /Source/cmGlobalGenerator.cxx | |
| parent | ebf8d0a99ac6eb231180b3315b976bcc58baa9f3 (diff) | |
| download | CMake-357bf469c7a6c6adad1f3269474989af9b203994.zip CMake-357bf469c7a6c6adad1f3269474989af9b203994.tar.gz CMake-357bf469c7a6c6adad1f3269474989af9b203994.tar.bz2 | |
cmGlobalGenerator: Fill the project map at compute time.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index e0e5af1..08ab163 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1158,10 +1158,6 @@ void cmGlobalGenerator::Configure() // and for infinite loops 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) { std::ostringstream msg; @@ -1268,6 +1264,10 @@ bool cmGlobalGenerator::Compute() 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 // Iterate through all targets and set up automoc for those which have // the AUTOMOC, AUTOUIC or AUTORCC property set |