diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-23 16:26:39 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-24 07:19:56 (GMT) |
| commit | ce9e9a92cf773280de55ef6dcbec9fc2524f7b2e (patch) | |
| tree | 63083811461d1a747635aac786921fdd522b1bda /Source/cmGlobalVisualStudioGenerator.cxx | |
| parent | 26e23e8463f9b9e2298e317a70925c56bcb018d1 (diff) | |
| download | CMake-ce9e9a92cf773280de55ef6dcbec9fc2524f7b2e.zip CMake-ce9e9a92cf773280de55ef6dcbec9fc2524f7b2e.tar.gz CMake-ce9e9a92cf773280de55ef6dcbec9fc2524f7b2e.tar.bz2 | |
VS: Port LinkClosure to cmGeneratorTarget
Diffstat (limited to 'Source/cmGlobalVisualStudioGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudioGenerator.cxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index 4d431f6..c43f884 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -303,19 +303,20 @@ std::string cmGlobalVisualStudioGenerator::GetUserMacrosRegKeyBase() } //---------------------------------------------------------------------------- -void cmGlobalVisualStudioGenerator::FillLinkClosure(cmTarget const* target, - TargetSet& linked) +void cmGlobalVisualStudioGenerator::FillLinkClosure( + const cmGeneratorTarget *target, + TargetSet& linked) { - if(linked.insert(target).second) + if(linked.insert(target->Target).second) { - cmGeneratorTarget* gt = this->GetGeneratorTarget(target); - TargetDependSet const& depends = this->GetTargetDirectDepends(gt); + TargetDependSet const& depends = + this->GetTargetDirectDepends(target); for(TargetDependSet::const_iterator di = depends.begin(); di != depends.end(); ++di) { if(di->IsLink()) { - this->FillLinkClosure((*di)->Target, linked); + this->FillLinkClosure(*di, linked); } } } @@ -323,12 +324,12 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(cmTarget const* target, //---------------------------------------------------------------------------- cmGlobalVisualStudioGenerator::TargetSet const& -cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmTarget* target) +cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmGeneratorTarget* target) { - TargetSetMap::iterator i = this->TargetLinkClosure.find(target); + TargetSetMap::iterator i = this->TargetLinkClosure.find(target->Target); if(i == this->TargetLinkClosure.end()) { - TargetSetMap::value_type entry(target, TargetSet()); + TargetSetMap::value_type entry(target->Target, TargetSet()); i = this->TargetLinkClosure.insert(entry).first; this->FillLinkClosure(target, i->second); } @@ -461,7 +462,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target) TargetSet linked; if(target.GetType() != cmState::STATIC_LIBRARY) { - linked = this->GetTargetLinkClosure(&target); + linked = this->GetTargetLinkClosure(gt); } // Emit link dependencies. |