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

BUG: fix progress for ENCLUDE_FORM_ALL cases using new project to target map. Only fixes it for the top level all target

This commit is contained in:
Ken Martin 2007-04-12 14:21:58 -04:00
parent 688ebad20e
commit b4de606bdd
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -912,40 +912,29 @@ int cmGlobalUnixMakefileGenerator3
return result; return result;
} }
unsigned long cmGlobalUnixMakefileGenerator3:: unsigned long cmGlobalUnixMakefileGenerator3
GetNumberOfProgressActionsInAll(cmLocalUnixMakefileGenerator3 *lg) ::GetNumberOfProgressActionsInAll(cmLocalUnixMakefileGenerator3 *lg)
{ {
unsigned long result = 0; unsigned long result = 0;
// for every target in the top level all // for every target in the top level all
if (!lg->GetParent()) if (!lg->GetParent())
{ {
// loop over the generators and targets // use the new project to target map
unsigned int i; std::set<cmTarget*> &targets =
cmLocalUnixMakefileGenerator3 *lg3; this->ProjectToTargetMap[lg->GetMakefile()->GetProjectName()];
for (i = 0; i < this->LocalGenerators.size(); ++i) std::set<cmTarget*>::iterator t = targets.begin();
for(; t != targets.end(); ++t)
{ {
lg3 = static_cast<cmLocalUnixMakefileGenerator3 *> cmTarget* target = *t;
(this->LocalGenerators[i]); cmLocalUnixMakefileGenerator3 *lg3 =
// for each target Generate the rule files for each target. static_cast<cmLocalUnixMakefileGenerator3 *>
cmTargets& targets = lg3->GetMakefile()->GetTargets(); (target->GetMakefile()->GetLocalGenerator());
for(cmTargets::iterator t = targets.begin(); t != targets.end(); ++t) std::vector<int> &progFiles = lg3->ProgressFiles[target->GetName()];
{ result += static_cast<unsigned long>(progFiles.size());
if((t->second.GetType() == cmTarget::EXECUTABLE) ||
(t->second.GetType() == cmTarget::STATIC_LIBRARY) ||
(t->second.GetType() == cmTarget::SHARED_LIBRARY) ||
(t->second.GetType() == cmTarget::MODULE_LIBRARY) ||
(t->second.GetType() == cmTarget::UTILITY))
{
if (!t->second.GetPropertyAsBool("EXCLUDE_FROM_ALL"))
{
std::vector<int> &progFiles = lg3->ProgressFiles[t->first];
result += static_cast<unsigned long>(progFiles.size());
}
}
}
} }
} }
// for subdirectories
else else
{ {
std::deque<cmLocalUnixMakefileGenerator3 *> lg3Stack; std::deque<cmLocalUnixMakefileGenerator3 *> lg3Stack;