diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-14 13:37:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-07-14 13:37:52 (GMT) |
| commit | 47bf22e121947169af53acbe89a30ff48fd2d75e (patch) | |
| tree | a6a954bdb3f8d2e7f5e270b0f307ea2139252ee8 /Source | |
| parent | cb867dc4f4bb17d3fd9a5182ac8b789a9dc01818 (diff) | |
| parent | affe9d56a2e17683dc87c457c27cad7f39b0ad56 (diff) | |
| download | CMake-47bf22e121947169af53acbe89a30ff48fd2d75e.zip CMake-47bf22e121947169af53acbe89a30ff48fd2d75e.tar.gz CMake-47bf22e121947169af53acbe89a30ff48fd2d75e.tar.bz2 | |
Merge topic 'interface-sources-target-objects'
affe9d56 Allow INTERFACE_SOURCES to specify $<TARGET_OBJECTS> (#14970)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluator.cxx | 1 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 1 |
2 files changed, 2 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, diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 0a7724c..667c2a4 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -6375,6 +6375,7 @@ void cmTargetInternals::AddInterfaceEntries( "$<TARGET_PROPERTY:" + *it + "," + prop + ">"; cmGeneratorExpression ge(&it->Backtrace); cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(genex); + cge->SetEvaluateForBuildsystem(true); entries.push_back( new cmTargetInternals::TargetPropertyEntry(cge, *it)); } |