diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-09 17:11:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-07-14 13:09:32 (GMT) |
| commit | affe9d56a2e17683dc87c457c27cad7f39b0ad56 (patch) | |
| tree | 47df80de0c25aa6e4d7e79ee503100a52dcb32d1 /Source/cmGeneratorExpressionEvaluator.cxx | |
| parent | 55d3e88fb7eb5cfdb58c5617133dfaf70d3b0547 (diff) | |
| download | CMake-affe9d56a2e17683dc87c457c27cad7f39b0ad56.zip CMake-affe9d56a2e17683dc87c457c27cad7f39b0ad56.tar.gz CMake-affe9d56a2e17683dc87c457c27cad7f39b0ad56.tar.bz2 | |
Allow INTERFACE_SOURCES to specify $<TARGET_OBJECTS> (#14970)
Fix cmTarget::GetSourceFiles to set EvaluateForBuildsystem on the
$<TARGET_PROPERTY:...,INTERFACE_SOURCES> generator expression so that
the $<TARGET_OBJECTS> generator expression is allowed within an
INTERFACE_SOURCES value.
Extend the InterfaceLibrary test to cover this case. Extend the
RunCMake.TargetObjects test to cover failure of $<TARGET_OBJECTS>
when used through $<TARGET_PROPERTY:...,INTERFACE_SOURCES> in a
non-buildsystem context.
Diffstat (limited to 'Source/cmGeneratorExpressionEvaluator.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluator.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index 13eac3b..3b83cd3 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -1210,6 +1210,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode { cmGeneratorExpression ge(&context->Backtrace); cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(prop); + cge->SetEvaluateForBuildsystem(context->EvaluateForBuildsystem); std::string result = cge->Evaluate(context->Makefile, context->Config, context->Quiet, |