From 2ad4f4bb9de4bb5ec85099ec993795d221f8b974 Mon Sep 17 00:00:00 2001 From: Ken Martin Date: Wed, 12 Mar 2008 14:37:46 -0400 Subject: BUG: fix some bad changes in progress calc --- Source/cmGlobalUnixMakefileGenerator3.cxx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 08adf0e..0871bc9 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -877,16 +877,12 @@ unsigned long cmGlobalUnixMakefileGenerator3 ::GetNumberOfProgressActionsInAll(cmLocalUnixMakefileGenerator3 *lg) { unsigned long result = 0; + std::set emitted; std::set& targets = this->LocalGeneratorToTargetMap[lg]; for(std::set::iterator t = targets.begin(); t != targets.end(); ++t) { - cmTarget * target = *t; - cmLocalUnixMakefileGenerator3 *lg3 = - static_cast - (target->GetMakefile()->GetLocalGenerator()); - std::vector &progFiles = lg3->ProgressFiles[target->GetName()]; - result += static_cast(progFiles.size()); + result += this->GetTargetTotalNumberOfActions(**t,emitted); } return result; } -- cgit v0.12