diff options
author | Ken Martin <ken.martin@kitware.com> | 2008-03-12 18:37:46 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2008-03-12 18:37:46 (GMT) |
commit | 2ad4f4bb9de4bb5ec85099ec993795d221f8b974 (patch) | |
tree | 52d364edc815a6db9f769a51aa6bde2e1afd78c4 /Source/cmGlobalUnixMakefileGenerator3.cxx | |
parent | c559ce8f6fff0661f7a64c2edd8cd3cfb5a48988 (diff) | |
download | CMake-2ad4f4bb9de4bb5ec85099ec993795d221f8b974.zip CMake-2ad4f4bb9de4bb5ec85099ec993795d221f8b974.tar.gz CMake-2ad4f4bb9de4bb5ec85099ec993795d221f8b974.tar.bz2 |
BUG: fix some bad changes in progress calc
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
-rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 8 |
1 files 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<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; } |