diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-07 23:12:25 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-12 16:39:59 (GMT) |
| commit | 1fdccff5894914d4408e64c0b55e52c376e64ad4 (patch) | |
| tree | 3cf6b0e135fc581eeb8d94d70eab6304b76e33f9 | |
| parent | ce75c86ec30e736a738a4143d4abad73117e06c6 (diff) | |
| download | CMake-1fdccff5894914d4408e64c0b55e52c376e64ad4.zip CMake-1fdccff5894914d4408e64c0b55e52c376e64ad4.tar.gz CMake-1fdccff5894914d4408e64c0b55e52c376e64ad4.tar.bz2 | |
Genex: Port implementation detail to cmGeneratorTarget.
| -rw-r--r-- | Source/cmGeneratorExpressionNode.cxx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index 2d9025e..88d10aa 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -831,8 +831,8 @@ template <typename T> std::string getLinkedTargetsContent( std::vector<T> const &libraries, - cmTarget const* target, - cmTarget const* headTarget, + cmGeneratorTarget const* target, + cmGeneratorTarget const* headTarget, cmGeneratorExpressionContext *context, cmGeneratorExpressionDAGChecker *dagChecker, const std::string &interfacePropertyName) @@ -846,7 +846,7 @@ getLinkedTargetsContent( // Broken code can have a target in its own link interface. // Don't follow such link interface entries so as not to create a // self-referencing loop. - if (it->Target && it->Target->Target != target) + if (it->Target && it->Target != target) { depString += sep + "$<TARGET_PROPERTY:" + @@ -858,8 +858,10 @@ getLinkedTargetsContent( { linkedTargetsContent = cmGeneratorExpressionNode::EvaluateDependentExpression(depString, - target->GetMakefile(), context, - headTarget, target, dagChecker); + target->Target->GetMakefile(), + context, + headTarget->Target, + target->Target, dagChecker); } linkedTargetsContent = cmGeneratorExpression::StripEmptyListElements(linkedTargetsContent); @@ -1116,8 +1118,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode gtgt->GetLinkInterfaceLibraries(context->Config, gHeadTarget, true)) { linkedTargetsContent = - getLinkedTargetsContent(iface->Libraries, target, - headTarget, + getLinkedTargetsContent(iface->Libraries, gtgt, + gHeadTarget, context, &dagChecker, interfacePropertyName); } @@ -1128,8 +1130,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode gtgt->GetLinkImplementationLibraries(context->Config)) { linkedTargetsContent = - getLinkedTargetsContent(impl->Libraries, target, - target, + getLinkedTargetsContent(impl->Libraries, gtgt, + gtgt, context, &dagChecker, interfacePropertyName); } |