diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-09 21:44:11 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-19 18:27:40 (GMT) |
| commit | 8e20ea6ef2258867bd6554536fa7b914f266df96 (patch) | |
| tree | d999ce9be3f883ce7a4357a8c2b3ccf3b4fd38ef /Source/cmGlobalVisualStudioGenerator.cxx | |
| parent | a527abf0995fc1bdd45afdb20e80b728dd0ef045 (diff) | |
| download | CMake-8e20ea6ef2258867bd6554536fa7b914f266df96.zip CMake-8e20ea6ef2258867bd6554536fa7b914f266df96.tar.gz CMake-8e20ea6ef2258867bd6554536fa7b914f266df96.tar.bz2 | |
cmGeneratorTarget: Move IsLinkable from cmTarget.
Diffstat (limited to 'Source/cmGlobalVisualStudioGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudioGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index d81d3b8..9af5b35 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -385,7 +385,7 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends() } //---------------------------------------------------------------------------- -static bool VSLinkable(cmTarget const* t) +static bool VSLinkable(cmGeneratorTarget const* t) { return t->IsLinkable() || t->GetType() == cmState::OBJECT_LIBRARY; } @@ -475,7 +475,8 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target) di != utilDepends.end(); ++di) { cmTarget const* dep = *di; - if(allowLinkable || !VSLinkable(dep) || linked.count(dep)) + cmGeneratorTarget* dgt = this->GetGeneratorTarget(dep); + if(allowLinkable || !VSLinkable(dgt) || linked.count(dep)) { // Direct dependency allowed. vsTargetDepend.insert(dep->GetName()); |