[Cmake-commits] CMake branch, next, updated. v2.8.11-2473-g0e4620d

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0e4620d1ceea0528a1d1b019c576c55bbe5d5520 (commit)
       via  4fab70449017394d92908f0cbd2b08ae0a50ecf7 (commit)
      from  574f8c7fdc0c6660c7a38322de332af7af73a266 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e4620d1ceea0528a1d1b019c576c55bbe5d5520
commit 0e4620d1ceea0528a1d1b019c576c55bbe5d5520
Merge: 574f8c7 4fab704
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 05:03:08 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 4 05:03:08 2013 -0400

    Merge topic 'fix-genex-HEAD-target' into next
    
    4fab704 Use the same headTarget to evaluate linked content.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4fab70449017394d92908f0cbd2b08ae0a50ecf7
commit 4fab70449017394d92908f0cbd2b08ae0a50ecf7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 11:01:17 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 4 11:01:58 2013 +0200

    Use the same headTarget to evaluate linked content.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index c14ea12..a01a0f8 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -315,6 +315,7 @@ static const char* targetPropertyTransitiveWhitelist[] = {
 
 std::string getLinkedTargetsContent(const std::vector<std::string> &libraries,
                                   cmTarget *target,
+                                  cmTarget *headTarget,
                                   cmGeneratorExpressionContext *context,
                                   cmGeneratorExpressionDAGChecker *dagChecker,
                                   const std::string &interfacePropertyName)
@@ -345,7 +346,7 @@ std::string getLinkedTargetsContent(const std::vector<std::string> &libraries,
   std::string linkedTargetsContent = cge->Evaluate(context->Makefile,
                       context->Config,
                       context->Quiet,
-                      context->HeadTarget,
+                      headTarget,
                       target,
                       dagChecker);
   if (cge->GetHadContextSensitiveCondition())
@@ -554,6 +555,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         {
         linkedTargetsContent =
                   getLinkedTargetsContent(iface->Libraries, target,
+                                          headTarget,
                                           context, &dagChecker,
                                           interfacePropertyName);
         }
@@ -568,6 +570,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         {
         linkedTargetsContent =
                   getLinkedTargetsContent(impl->Libraries, target,
+                                          headTarget,
                                           context, &dagChecker,
                                           interfacePropertyName);
         }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGeneratorExpressionEvaluator.cxx |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake