diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-22 12:47:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-22 12:47:58 (GMT) |
| commit | 1f8bbfec0f7182b401e483a7ef17dc05daaeac92 (patch) | |
| tree | 58325bc3ccccfa801d82ebe5e6642ccb178513ea /Source | |
| parent | 8bbbc49cc1ec8f0f28c551124a65cb6a7bbb17a0 (diff) | |
| parent | af1a4f52be86c0054006ad98a64316b5531e1bf4 (diff) | |
| download | CMake-1f8bbfec0f7182b401e483a7ef17dc05daaeac92.zip CMake-1f8bbfec0f7182b401e483a7ef17dc05daaeac92.tar.gz CMake-1f8bbfec0f7182b401e483a7ef17dc05daaeac92.tar.bz2 | |
Merge topic 'TARGET_PROPERTY-strip-empty-list-elements'
af1a4f52be Genex: $<TARGET_PROPERTY> strip emtpy list elements for predefined properties
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5030
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorExpressionNode.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index a1a0ae8..fdc8f29 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -1476,8 +1476,9 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode } if (isInterfaceProperty) { - return target->EvaluateInterfaceProperty(propertyName, context, - dagCheckerParent); + return cmGeneratorExpression::StripEmptyListElements( + target->EvaluateInterfaceProperty(propertyName, context, + dagCheckerParent)); } cmGeneratorExpressionDAGChecker dagChecker( @@ -1563,8 +1564,9 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode } if (!interfacePropertyName.empty()) { - result = this->EvaluateDependentExpression(result, context->LG, context, - target, &dagChecker, target); + result = cmGeneratorExpression::StripEmptyListElements( + this->EvaluateDependentExpression(result, context->LG, context, target, + &dagChecker, target)); std::string linkedTargetsContent = getLinkedTargetsContent( target, interfacePropertyName, context, &dagChecker); if (!linkedTargetsContent.empty()) { |