diff options
| author | Brad King <brad.king@kitware.com> | 2014-08-07 14:07:51 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-08-07 14:07:51 (GMT) |
| commit | 6f0d1a38c8eee267cf16c4b6bae90ddf218f3088 (patch) | |
| tree | 5636b9c3df1b893748b7f1e30daccdc99807210c /Source/cmGeneratorExpressionEvaluator.cxx | |
| parent | df08d8575b56699c592ba8dec747dc7f6329b1b7 (diff) | |
| parent | 3f476beaf7ffc20a27d97fbf04f6699791996f7f (diff) | |
| download | CMake-6f0d1a38c8eee267cf16c4b6bae90ddf218f3088.zip CMake-6f0d1a38c8eee267cf16c4b6bae90ddf218f3088.tar.gz CMake-6f0d1a38c8eee267cf16c4b6bae90ddf218f3088.tar.bz2 | |
Merge topic 'genex-build-property-no-head'
3f476bea Genex: Do not consider 'head' when evaluating build properties
Diffstat (limited to 'Source/cmGeneratorExpressionEvaluator.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index 70f33b7..c1478df 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -1078,7 +1078,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode } } #undef POPULATE_INTERFACE_PROPERTY_NAME - cmTarget const* headTarget = context->HeadTarget + cmTarget const* headTarget = context->HeadTarget && isInterfaceProperty ? context->HeadTarget : target; if(isInterfaceProperty) @@ -1100,7 +1100,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode { linkedTargetsContent = getLinkedTargetsContent(impl->Libraries, target, - headTarget, + target, context, &dagChecker, interfacePropertyName); } |