diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-06-06 13:24:24 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-07-01 17:46:19 (GMT) |
| commit | d4a8a554ea2b3af2ea850cf003e35ac23118a33b (patch) | |
| tree | eb0e9171131c216ad11c493ab34ca760c569d360 /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | faec4e611d08ea2f75d2127e3ca3f5e9a427465b (diff) | |
| download | CMake-d4a8a554ea2b3af2ea850cf003e35ac23118a33b.zip CMake-d4a8a554ea2b3af2ea850cf003e35ac23118a33b.tar.gz CMake-d4a8a554ea2b3af2ea850cf003e35ac23118a33b.tar.bz2 | |
cmGlobalGenerator: Map local generators to generator targets.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 412728f..e6a67d3 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -830,7 +830,7 @@ cmGlobalUnixMakefileGenerator3 cmLocalGenerator::FULL, cmLocalGenerator::SHELL); // - std::set<cmTarget const*> emitted; + std::set<cmGeneratorTarget const*> emitted; progCmd << " " << this->CountProgressMarksInTarget(gtarget, emitted); commands.push_back(progCmd.str()); @@ -909,10 +909,10 @@ cmGlobalUnixMakefileGenerator3 size_t cmGlobalUnixMakefileGenerator3 ::CountProgressMarksInTarget(cmGeneratorTarget const* target, - std::set<cmTarget const*>& emitted) + std::set<cmGeneratorTarget const*>& emitted) { size_t count = 0; - if(emitted.insert(target->Target).second) + if(emitted.insert(target).second) { count = this->ProgressMap[target->Target].Marks.size(); TargetDependSet const& depends = this->GetTargetDirectDepends(target); @@ -935,14 +935,13 @@ cmGlobalUnixMakefileGenerator3 ::CountProgressMarksInAll(cmLocalUnixMakefileGenerator3* lg) { size_t count = 0; - std::set<cmTarget const*> emitted; - std::set<cmTarget const*> const& targets + std::set<cmGeneratorTarget const*> emitted; + std::set<cmGeneratorTarget const*> const& targets = this->LocalGeneratorToTargetMap[lg]; - for(std::set<cmTarget const*>::const_iterator t = targets.begin(); + for(std::set<cmGeneratorTarget const*>::const_iterator t = targets.begin(); t != targets.end(); ++t) { - cmGeneratorTarget* gt = this->GetGeneratorTarget(*t); - count += this->CountProgressMarksInTarget(gt, emitted); + count += this->CountProgressMarksInTarget(*t, emitted); } return count; } |