summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-08-02 10:45:17 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-08-07 02:10:29 (GMT)
commit56f0540b5183036b46babbfc9b9ec0979e54992f (patch)
tree090d7c1f9b9f08c8023fea1e706545f87506847f /Source
parent19b546ef766acedfcc9e19541c71b6a56d7fe630 (diff)
downloadCMake-56f0540b5183036b46babbfc9b9ec0979e54992f.zip
CMake-56f0540b5183036b46babbfc9b9ec0979e54992f.tar.gz
CMake-56f0540b5183036b46babbfc9b9ec0979e54992f.tar.bz2
cmGlobalGenerator: Port Configure-time check to cmMakefile.
This uses no generate-time state.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGlobalGenerator.cxx11
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 83bfe57..98961d8 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1641,11 +1641,11 @@ void cmGlobalGenerator::CheckLocalGenerators()
// std::set<std::string> notFoundMap;
// after it is all done do a ConfigureFinalPass
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 =
- this->LocalGenerators[i]->GetMakefile()->GetTargets();
+ this->Makefiles[i]->GetTargets();
for (cmTargets::iterator l = targets.begin();
l != targets.end(); l++)
{
@@ -1700,15 +1700,14 @@ void cmGlobalGenerator::CheckLocalGenerators()
}
std::string text = notFoundMap[varName];
text += "\n used as include directory in directory ";
- text += this->LocalGenerators[i]
- ->GetMakefile()->GetCurrentSourceDirectory();
+ text += this->Makefiles[i]->GetCurrentSourceDirectory();
notFoundMap[varName] = text;
}
}
}
this->CMakeInstance->UpdateProgress
("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())