[Cmake-commits] CMake branch, next, updated. v2.8.11-2469-gac003e6

[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  ac003e63c4e3a4b95c6c1c47e9c822e2c9ee4837 (commit)
       via  f06155c45bf701a771be1b011131bbf75e5cdb2d (commit)
      from  43aad43b3bbe36ff462f99529305aa7a8acd1056 (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=ac003e63c4e3a4b95c6c1c47e9c822e2c9ee4837
commit ac003e63c4e3a4b95c6c1c47e9c822e2c9ee4837
Merge: 43aad43 f06155c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jun 3 18:53:50 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 3 18:53:50 2013 -0400

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


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

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

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 3b41362..5e7d00d 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -729,8 +729,6 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       interfacePropertyName = "INTERFACE_COMPILE_OPTIONS";
       }
 
-    cmTarget *headTarget = context->HeadTarget ? context->HeadTarget : target;
-
     const char **transBegin = targetPropertyTransitiveWhitelist;
     const char **transEnd = targetPropertyTransitiveWhitelist
               + (sizeof(targetPropertyTransitiveWhitelist) /
@@ -740,7 +738,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       {
       const cmTarget::LinkInterface *iface = target->GetLinkInterface(
                                                     context->Config,
-                                                    headTarget);
+                                                    context->HeadTarget);
       if(iface)
         {
         linkedTargetsContent =
@@ -754,7 +752,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       {
       const cmTarget::LinkImplementation *impl = target->GetLinkImplementation(
                                                     context->Config,
-                                                    headTarget);
+                                                    context->HeadTarget);
       if(impl)
         {
         linkedTargetsContent =
@@ -807,7 +805,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 |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake