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/cmGlobalGenerator.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/cmGlobalGenerator.cxx')
-rw-r--r-- | Source/cmGlobalGenerator.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index a69732e..f310744 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -2043,20 +2043,19 @@ void cmGlobalGenerator::FillLocalGeneratorToTargetMap() clg = clg->GetParent()) { // This local generator includes the target. - std::set<cmTarget const*>& targetSet = + std::set<cmGeneratorTarget const*>& targetSet = this->LocalGeneratorToTargetMap[clg]; - targetSet.insert(&target); + cmGeneratorTarget* gt = this->GetGeneratorTarget(&target); + targetSet.insert(gt); // Add dependencies of the included target. An excluded // target may still be included if it is a dependency of a // non-excluded target. - cmGeneratorTarget* gt = this->GetGeneratorTarget(&target); TargetDependSet const& tgtdeps = this->GetTargetDirectDepends(gt); for(TargetDependSet::const_iterator ti = tgtdeps.begin(); ti != tgtdeps.end(); ++ti) { - cmGeneratorTarget const* ttt = *ti; - targetSet.insert(ttt->Target); + targetSet.insert(*ti); } } } |