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

cmGlobalGenerator: Port Configure-time check to cmMakefile. 

This uses no generate-time state.
This commit is contained in:
Stephen Kelly 2015-08-02 12:45:17 +02:00
parent 19b546ef76
commit 56f0540b51
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmGlobalGenerator.cxx
View File

@ -1641,11 +1641,11 @@ void cmGlobalGenerator::CheckLocalGenerators()
// std::set<std::string> notFoundMap; // std::set<std::string> notFoundMap;
// after it is all done do a ConfigureFinalPass // after it is all done do a ConfigureFinalPass
cmState* state = this->GetCMakeInstance()->GetState(); cmState* state = this->GetCMakeInstance()->GetState();
for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i) for (unsigned int i = 0; i < this->Makefiles.size(); ++i)
{ {
this->LocalGenerators[i]->GetMakefile()->ConfigureFinalPass(); this->Makefiles[i]->ConfigureFinalPass();
cmTargets &targets = cmTargets &targets =
this->LocalGenerators[i]->GetMakefile()->GetTargets(); this->Makefiles[i]->GetTargets();
for (cmTargets::iterator l = targets.begin(); for (cmTargets::iterator l = targets.begin();
l != targets.end(); l++) l != targets.end(); l++)
{ {
@ -1700,15 +1700,14 @@ void cmGlobalGenerator::CheckLocalGenerators()
} }
std::string text = notFoundMap[varName]; std::string text = notFoundMap[varName];
text += "\n used as include directory in directory "; text += "\n used as include directory in directory ";
text += this->LocalGenerators[i] text += this->Makefiles[i]->GetCurrentSourceDirectory();
->GetMakefile()->GetCurrentSourceDirectory();
notFoundMap[varName] = text; notFoundMap[varName] = text;
} }
} }
} }
this->CMakeInstance->UpdateProgress this->CMakeInstance->UpdateProgress
("Configuring", 0.9f+0.1f*(static_cast<float>(i)+1.0f)/ ("Configuring", 0.9f+0.1f*(static_cast<float>(i)+1.0f)/
static_cast<float>(this->LocalGenerators.size())); static_cast<float>(this->Makefiles.size()));
} }
if(!notFoundMap.empty()) if(!notFoundMap.empty())