[Cmake-commits] CMake branch, next, updated. v2.8.11-2495-g3009e8e

[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  3009e8eafa80c3eaca2e764dae17857dc5974362 (commit)
       via  cfa09ddcccc43b1b068358f8c08cb82f12cfc325 (commit)
      from  c744a0bddf343d9ff63543bdce6b436930cf1369 (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=3009e8eafa80c3eaca2e764dae17857dc5974362
commit 3009e8eafa80c3eaca2e764dae17857dc5974362
Merge: c744a0b cfa09dd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 05:50:06 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 4 05:50:06 2013 -0400

    Merge topic 'test-genex-HEAD-target' into next
    
    cfa09dd Revert "Revert "Genex: Fix the HEAD target used for evaluated expressions.""

diff --cc Source/cmGeneratorExpressionEvaluator.cxx
index 5e7d00d,a01a0f8..28f749d
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@@ -723,12 -538,9 +724,14 @@@ static const struct TargetPropertyNode 
        {
        interfacePropertyName = "INTERFACE_COMPILE_DEFINITIONS";
        }
 +    else if (propertyName == "INTERFACE_COMPILE_OPTIONS"
 +        || propertyName == "COMPILE_OPTIONS")
 +      {
 +      interfacePropertyName = "INTERFACE_COMPILE_OPTIONS";
 +      }
  
+     cmTarget *headTarget = context->HeadTarget ? context->HeadTarget : target;
+ 
      const char **transBegin = targetPropertyTransitiveWhitelist;
      const char **transEnd = targetPropertyTransitiveWhitelist
                + (sizeof(targetPropertyTransitiveWhitelist) /

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

    Revert "Revert "Genex: Fix the HEAD target used for evaluated expressions.""
    
    This reverts commit ffe0d3404eaed4aae12d6cda240e80b49e3ecd1b.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index de6371a..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())
@@ -538,6 +539,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       interfacePropertyName = "INTERFACE_COMPILE_DEFINITIONS";
       }
 
+    cmTarget *headTarget = context->HeadTarget ? context->HeadTarget : target;
+
     const char **transBegin = targetPropertyTransitiveWhitelist;
     const char **transEnd = targetPropertyTransitiveWhitelist
               + (sizeof(targetPropertyTransitiveWhitelist) /
@@ -547,11 +550,12 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       {
       const cmTarget::LinkInterface *iface = target->GetLinkInterface(
                                                     context->Config,
-                                                    context->HeadTarget);
+                                                    headTarget);
       if(iface)
         {
         linkedTargetsContent =
                   getLinkedTargetsContent(iface->Libraries, target,
+                                          headTarget,
                                           context, &dagChecker,
                                           interfacePropertyName);
         }
@@ -561,11 +565,12 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       {
       const cmTarget::LinkImplementation *impl = target->GetLinkImplementation(
                                                     context->Config,
-                                                    context->HeadTarget);
+                                                    headTarget);
       if(impl)
         {
         linkedTargetsContent =
                   getLinkedTargetsContent(impl->Libraries, target,
+                                          headTarget,
                                           context, &dagChecker,
                                           interfacePropertyName);
         }
@@ -614,7 +619,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         std::string result = cge->Evaluate(context->Makefile,
                             context->Config,
                             context->Quiet,
-                            context->HeadTarget,
+                            headTarget,
                             target,
                             &dagChecker);
 

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

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


hooks/post-receive
-- 
CMake