[Cmake-commits] CMake branch, next, updated. v2.8.11-2482-gc4d832f

[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  c4d832ff9d98d6aca1390f7c44a79f9e4ba41ff7 (commit)
       via  316b2706f0c83ee9a0f175f8f509f56cde470d21 (commit)
       via  a53a50537d2289ff42f2e0c550a9944e25ce857d (commit)
      from  754f9c6dcc75e6b95861a7ad26f51cc0b7bd7747 (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=c4d832ff9d98d6aca1390f7c44a79f9e4ba41ff7
commit c4d832ff9d98d6aca1390f7c44a79f9e4ba41ff7
Merge: 754f9c6 316b270
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 05:12:11 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 4 05:12:11 2013 -0400

    Merge topic 'fix-genex-HEAD-target' into next
    
    316b270 Revert "Genex: Fix the HEAD target used for evaluated expressions."
    a53a5053 Revert "Use the same headTarget to evaluate linked content."

diff --cc Source/cmGeneratorExpressionEvaluator.cxx
index 02acb9d,de6371a..5e7d00d
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@@ -723,14 -537,7 +723,12 @@@ 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=316b2706f0c83ee9a0f175f8f509f56cde470d21
commit 316b2706f0c83ee9a0f175f8f509f56cde470d21
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 11:11:40 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 4 11:11:40 2013 +0200

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

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index c14ea12..de6371a 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -538,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) /
@@ -549,7 +547,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       {
       const cmTarget::LinkInterface *iface = target->GetLinkInterface(
                                                     context->Config,
-                                                    headTarget);
+                                                    context->HeadTarget);
       if(iface)
         {
         linkedTargetsContent =
@@ -563,7 +561,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       {
       const cmTarget::LinkImplementation *impl = target->GetLinkImplementation(
                                                     context->Config,
-                                                    headTarget);
+                                                    context->HeadTarget);
       if(impl)
         {
         linkedTargetsContent =
@@ -616,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);
 

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

    Revert "Use the same headTarget to evaluate linked content."
    
    This reverts commit 4fab70449017394d92908f0cbd2b08ae0a50ecf7.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index a01a0f8..c14ea12 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())
@@ -555,7 +554,6 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         {
         linkedTargetsContent =
                   getLinkedTargetsContent(iface->Libraries, target,
-                                          headTarget,
                                           context, &dagChecker,
                                           interfacePropertyName);
         }
@@ -570,7 +568,6 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         {
         linkedTargetsContent =
                   getLinkedTargetsContent(impl->Libraries, target,
-                                          headTarget,
                                           context, &dagChecker,
                                           interfacePropertyName);
         }

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

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


hooks/post-receive
-- 
CMake