[Cmake-commits] CMake branch, next, updated. v2.8.11-2479-g754f9c6

[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  754f9c6dcc75e6b95861a7ad26f51cc0b7bd7747 (commit)
       via  2920c8b3bfff6465df9e6cc6e17c3a6e80bdaf3f (commit)
      from  ee095cc257897a3d3a2acd629a21ce5ed9cdea7a (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=754f9c6dcc75e6b95861a7ad26f51cc0b7bd7747
commit 754f9c6dcc75e6b95861a7ad26f51cc0b7bd7747
Merge: ee095cc 2920c8b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 05:10:56 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 4 05:10:56 2013 -0400

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

diff --cc Source/cmGeneratorExpressionEvaluator.cxx
index da3b311,de6371a..02acb9d
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@@ -724,16 -537,7 +723,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;
  
-     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=2920c8b3bfff6465df9e6cc6e17c3a6e80bdaf3f
commit 2920c8b3bfff6465df9e6cc6e17c3a6e80bdaf3f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 11:10:28 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 4 11:10:28 2013 +0200

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

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

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

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


hooks/post-receive
-- 
CMake