diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 43d97b3f6a..789170d07f 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -771,7 +771,7 @@ cmGlobalUnixMakefileGenerator3 cmLocalGenerator::FULL, cmLocalGenerator::SHELL); // - std::set emitted; + std::set emitted; progCmd << " " << this->GetTargetTotalNumberOfActions(t->second, emitted); @@ -848,13 +848,13 @@ cmGlobalUnixMakefileGenerator3 //---------------------------------------------------------------------------- int cmGlobalUnixMakefileGenerator3 -::GetTargetTotalNumberOfActions(cmTarget & target, - std::set &emitted) +::GetTargetTotalNumberOfActions(cmTarget &target, + std::set &emitted) { // do not double count int result = 0; - if(emitted.insert(target.GetName()).second) + if(emitted.insert(&target).second) { cmLocalUnixMakefileGenerator3 *lg = static_cast @@ -877,7 +877,7 @@ unsigned long cmGlobalUnixMakefileGenerator3 ::GetNumberOfProgressActionsInAll(cmLocalUnixMakefileGenerator3 *lg) { unsigned long result = 0; - std::set emitted; + std::set emitted; std::set& targets = this->LocalGeneratorToTargetMap[lg]; for(std::set::iterator t = targets.begin(); t != targets.end(); ++t) diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h index cf8059985c..bce1b37451 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.h +++ b/Source/cmGlobalUnixMakefileGenerator3.h @@ -115,7 +115,7 @@ public: // returns some progress informaiton int GetTargetTotalNumberOfActions(cmTarget & target, - std::set &emitted); + std::set &emitted); unsigned long GetNumberOfProgressActionsInAll (cmLocalUnixMakefileGenerator3 *lg);