[Cmake-commits] CMake branch, next, updated. v2.8.11-2467-g43aad43

[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  43aad43b3bbe36ff462f99529305aa7a8acd1056 (commit)
       via  986a7f01cc75137ebdc204db06d146d86c3fa339 (commit)
      from  c231644e8848f5c8630acdebbfc8ad0c70562390 (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=43aad43b3bbe36ff462f99529305aa7a8acd1056
commit 43aad43b3bbe36ff462f99529305aa7a8acd1056
Merge: c231644 986a7f0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jun 3 18:52:41 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 3 18:52:41 2013 -0400

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

diff --cc Source/cmGeneratorExpressionEvaluator.cxx
index a14bbec,de6371a..02acb9d
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@@ -723,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=986a7f01cc75137ebdc204db06d146d86c3fa339
commit 986a7f01cc75137ebdc204db06d146d86c3fa339
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 00:51:45 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 4 00:51:45 2013 +0200

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

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);
 

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

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


hooks/post-receive
-- 
CMake