diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-16 02:38:52 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-12 21:07:46 (GMT) |
| commit | 1583440509a148d216d6691cdaeede1aa24af95c (patch) | |
| tree | bd79dcda7cd69b5f0257fd81d00e796c3462d273 /Source/cmGeneratorExpressionNode.cxx | |
| parent | 11165525ba663b4cd7a188c6b698822b8480aafb (diff) | |
| download | CMake-1583440509a148d216d6691cdaeede1aa24af95c.zip CMake-1583440509a148d216d6691cdaeede1aa24af95c.tar.gz CMake-1583440509a148d216d6691cdaeede1aa24af95c.tar.bz2 | |
cmGeneratorExpression: Port interface to cmGeneratorTarget.
Diffstat (limited to 'Source/cmGeneratorExpressionNode.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionNode.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index 61852ab..2797d10 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -19,7 +19,8 @@ std::string cmGeneratorExpressionNode::EvaluateDependentExpression( std::string const& prop, cmLocalGenerator *lg, cmGeneratorExpressionContext *context, - cmTarget const* headTarget, cmTarget const* currentTarget, + cmGeneratorTarget const* headTarget, + cmGeneratorTarget const* currentTarget, cmGeneratorExpressionDAGChecker *dagChecker) { cmGeneratorExpression ge(context->Backtrace); @@ -862,8 +863,8 @@ getLinkedTargetsContent( cmGeneratorExpressionNode::EvaluateDependentExpression(depString, target->GetLocalGenerator(), context, - headTarget->Target, - target->Target, dagChecker); + headTarget, + target, dagChecker); } linkedTargetsContent = cmGeneratorExpression::StripEmptyListElements(linkedTargetsContent); @@ -1215,9 +1216,11 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode } if(!interfacePropertyName.empty()) { + cmGeneratorTarget* gHeadTarget = + context->LG->GetGlobalGenerator()->GetGeneratorTarget(headTarget); std::string result = this->EvaluateDependentExpression(prop, context->LG, context, - headTarget, target, &dagChecker); + gHeadTarget, gtgt, &dagChecker); if (!linkedTargetsContent.empty()) { result += (result.empty() ? "" : ";") + linkedTargetsContent; |