diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-15 19:22:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-07-16 17:31:30 (GMT) |
| commit | d5f0743d0f97fb44bcfaafd8680a00631d1c7d40 (patch) | |
| tree | 4dd53ad0e00985645bf0e36559c6b969b2ceee5a /Source/cmGeneratorExpressionEvaluator.cxx | |
| parent | 60bafeb68404dc37434644f56e98000b3b0fff81 (diff) | |
| download | CMake-d5f0743d0f97fb44bcfaafd8680a00631d1c7d40.zip CMake-d5f0743d0f97fb44bcfaafd8680a00631d1c7d40.tar.gz CMake-d5f0743d0f97fb44bcfaafd8680a00631d1c7d40.tar.bz2 | |
Genex: Refactor empty element strip
In cmGeneratorExpressionEvaluator, teach getLinkedTargetsContent to call
cmGeneratorExpression::StripEmptyListElements to transform its return
value so that callers do not have to do so.
Diffstat (limited to 'Source/cmGeneratorExpressionEvaluator.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index ddcc39d..db1d180 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -841,6 +841,8 @@ getLinkedTargetsContent( context->HadContextSensitiveCondition = true; } } + linkedTargetsContent = + cmGeneratorExpression::StripEmptyListElements(linkedTargetsContent); return linkedTargetsContent; } @@ -1100,9 +1102,6 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode } } - linkedTargetsContent = - cmGeneratorExpression::StripEmptyListElements(linkedTargetsContent); - if (!prop) { if (target->IsImported() |