diff options
| author | Ken Martin <ken.martin@kitware.com> | 2008-05-29 15:50:33 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2008-05-29 15:50:33 (GMT) |
| commit | 0b4375daf28222c336c15c5e8af6695575dac02d (patch) | |
| tree | aa89f36976744c032635c682faec8ac35c2ddd2c /Source | |
| parent | 535d76d27617cc54e355792eea12f106873a8531 (diff) | |
| download | CMake-0b4375daf28222c336c15c5e8af6695575dac02d.zip CMake-0b4375daf28222c336c15c5e8af6695575dac02d.tar.gz CMake-0b4375daf28222c336c15c5e8af6695575dac02d.tar.bz2 | |
BUG: improve progress reporting when there are multiple targets with the same name, bug# 7042
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 10 | ||||
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 43d97b3..789170d 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -771,7 +771,7 @@ cmGlobalUnixMakefileGenerator3 cmLocalGenerator::FULL, cmLocalGenerator::SHELL); // - std::set<cmStdString> emitted; + std::set<cmTarget *> emitted; progCmd << " " << this->GetTargetTotalNumberOfActions(t->second, emitted); @@ -848,13 +848,13 @@ cmGlobalUnixMakefileGenerator3 //---------------------------------------------------------------------------- int cmGlobalUnixMakefileGenerator3 -::GetTargetTotalNumberOfActions(cmTarget & target, - std::set<cmStdString> &emitted) +::GetTargetTotalNumberOfActions(cmTarget &target, + std::set<cmTarget *> &emitted) { // do not double count int result = 0; - if(emitted.insert(target.GetName()).second) + if(emitted.insert(&target).second) { cmLocalUnixMakefileGenerator3 *lg = static_cast<cmLocalUnixMakefileGenerator3 *> @@ -877,7 +877,7 @@ unsigned long cmGlobalUnixMakefileGenerator3 ::GetNumberOfProgressActionsInAll(cmLocalUnixMakefileGenerator3 *lg) { unsigned long result = 0; - std::set<cmStdString> emitted; + std::set<cmTarget *> emitted; std::set<cmTarget *>& targets = this->LocalGeneratorToTargetMap[lg]; for(std::set<cmTarget *>::iterator t = targets.begin(); t != targets.end(); ++t) diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h index cf80599..bce1b37 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.h +++ b/Source/cmGlobalUnixMakefileGenerator3.h @@ -115,7 +115,7 @@ public: // returns some progress informaiton int GetTargetTotalNumberOfActions(cmTarget & target, - std::set<cmStdString> &emitted); + std::set<cmTarget *> &emitted); unsigned long GetNumberOfProgressActionsInAll (cmLocalUnixMakefileGenerator3 *lg); |