diff options
author | Brad King <brad.king@kitware.com> | 2013-01-10 15:22:52 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-01-10 15:22:52 (GMT) |
commit | 378899ce8744c2e2b43d0859234eea714dcef368 (patch) | |
tree | 9419bbdbfa1ca672a06219f61cfe232c25b73b77 /Source/cmGeneratorExpression.cxx | |
parent | 325e92fa22cb20a3d4bccbf1f663c28b34f8b04c (diff) | |
parent | 3581b96caa1d7bd6c02e85baf72ce28b5128e5e7 (diff) | |
download | CMake-378899ce8744c2e2b43d0859234eea714dcef368.zip CMake-378899ce8744c2e2b43d0859234eea714dcef368.tar.gz CMake-378899ce8744c2e2b43d0859234eea714dcef368.tar.bz2 |
Merge topic 'INTERFACE_POSITION_INDEPENDENT_CODE'
3581b96 Process the INTERFACE_PIC property from linked dependencies
042ecf0 Add API to calculate link-interface-dependent bool properties or error.
bf5ece5 Keep track of properties used to determine linker libraries.
Diffstat (limited to 'Source/cmGeneratorExpression.cxx')
-rw-r--r-- | Source/cmGeneratorExpression.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx index 6d003e1..4063697 100644 --- a/Source/cmGeneratorExpression.cxx +++ b/Source/cmGeneratorExpression.cxx @@ -94,7 +94,15 @@ const char *cmCompiledGeneratorExpression::Evaluate( for ( ; it != end; ++it) { - this->Output += (*it)->Evaluate(&context, dagChecker); + const std::string result = (*it)->Evaluate(&context, dagChecker); + this->Output += result; + + for(std::set<cmStdString>::const_iterator + p = context.SeenTargetProperties.begin(); + p != context.SeenTargetProperties.end(); ++p) + { + this->SeenTargetProperties[*p] += result + ";"; + } if (context.HadError) { this->Output = ""; |