diff options
author | Stephen Kelly <steveire@gmail.com> | 2013-02-07 12:04:46 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2013-02-07 15:21:09 (GMT) |
commit | d4e5c6787c40e27394c336730f59d878a81d1991 (patch) | |
tree | c262428c71c0c4fd31f24f71f2347031358db0d6 /Source/cmGeneratorExpression.cxx | |
parent | 1fb545ad3a8f6d263c9f01300bce978e81b6fe8c (diff) | |
download | CMake-d4e5c6787c40e27394c336730f59d878a81d1991.zip CMake-d4e5c6787c40e27394c336730f59d878a81d1991.tar.gz CMake-d4e5c6787c40e27394c336730f59d878a81d1991.tar.bz2 |
Don't keep track of content determined by target property values.
This tracking was added during the development of commit 042ecf04
(Add API to calculate link-interface-dependent bool properties
or error., 2013-01-06), but was never used.
It was not necessary to use the content because what is really
useful in that logic is to determine if a property has been implied
to be null by appearing in a LINK_LIBRARIES genex.
I think the motivating usecase for developing the feature of
keeping track of the targets relevant to a property was that I
thought it would make it possible to allow requiring granular
compatibility of interface properties only for targets which
depended on the interface property. Eg:
add_library(foo ...)
add_library(bar ...)
add_executable(user ...)
# Read the INTERFACE_POSITION_INDEPENDENT_CODE from bar, but not
# from foo:
target_link_libraries(user foo $<$<TARGET_PROPERTY:POSTITION_INDEPENDENT_CODE>:bar>)
This obviously doesn't make sense. We require that INTERFACE
properties are consistent across all linked targets instead.
Diffstat (limited to 'Source/cmGeneratorExpression.cxx')
-rw-r--r-- | Source/cmGeneratorExpression.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx index 60bf179..5d162fe 100644 --- a/Source/cmGeneratorExpression.cxx +++ b/Source/cmGeneratorExpression.cxx @@ -95,14 +95,13 @@ const char *cmCompiledGeneratorExpression::Evaluate( for ( ; it != end; ++it) { - const std::string result = (*it)->Evaluate(&context, dagChecker); - this->Output += result; + this->Output += (*it)->Evaluate(&context, dagChecker); for(std::set<cmStdString>::const_iterator p = context.SeenTargetProperties.begin(); p != context.SeenTargetProperties.end(); ++p) { - this->SeenTargetProperties[*p] += result + ";"; + this->SeenTargetProperties.insert(*p); } if (context.HadError) { |