Commit 2ad4f4bb authored by Ken Martin's avatar Ken Martin
Browse files

BUG: fix some bad changes in progress calc

parent c559ce8f
...@@ -877,16 +877,12 @@ unsigned long cmGlobalUnixMakefileGenerator3 ...@@ -877,16 +877,12 @@ unsigned long cmGlobalUnixMakefileGenerator3
::GetNumberOfProgressActionsInAll(cmLocalUnixMakefileGenerator3 *lg) ::GetNumberOfProgressActionsInAll(cmLocalUnixMakefileGenerator3 *lg)
{ {
unsigned long result = 0; unsigned long result = 0;
std::set<cmStdString> emitted;
std::set<cmTarget *>& targets = this->LocalGeneratorToTargetMap[lg]; std::set<cmTarget *>& targets = this->LocalGeneratorToTargetMap[lg];
for(std::set<cmTarget *>::iterator t = targets.begin(); for(std::set<cmTarget *>::iterator t = targets.begin();
t != targets.end(); ++t) t != targets.end(); ++t)
{ {
cmTarget * target = *t; result += this->GetTargetTotalNumberOfActions(**t,emitted);
cmLocalUnixMakefileGenerator3 *lg3 =
static_cast<cmLocalUnixMakefileGenerator3 *>
(target->GetMakefile()->GetLocalGenerator());
std::vector<int> &progFiles = lg3->ProgressFiles[target->GetName()];
result += static_cast<unsigned long>(progFiles.size());
} }
return result; return result;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment