summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2008-03-12 14:37:46 -0400
committerKen Martin <ken.martin@kitware.com>2008-03-12 14:37:46 -0400
commit2ad4f4bb9de4bb5ec85099ec993795d221f8b974 (patch)
tree52d364edc815a6db9f769a51aa6bde2e1afd78c4
parentc559ce8f6fff0661f7a64c2edd8cd3cfb5a48988 (diff)
downloadcmake-2ad4f4bb9de4bb5ec85099ec993795d221f8b974.tar.gz
BUG: fix some bad changes in progress calc
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.cxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 08adf0e7bd..0871bc9ef9 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<cmStdString> emitted;
std::set<cmTarget *>& targets = this->LocalGeneratorToTargetMap[lg];
for(std::set<cmTarget *>::iterator t = targets.begin();
t != targets.end(); ++t)
{
- cmTarget * target = *t;
- cmLocalUnixMakefileGenerator3 *lg3 =
- static_cast<cmLocalUnixMakefileGenerator3 *>
- (target->GetMakefile()->GetLocalGenerator());
- std::vector<int> &progFiles = lg3->ProgressFiles[target->GetName()];
- result += static_cast<unsigned long>(progFiles.size());
+ result += this->GetTargetTotalNumberOfActions(**t,emitted);
}
return result;
}