[Cmake-commits] CMake branch, next, updated. v2.8.11-2484-g5ea0e34

[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  5ea0e34b8dbfc8c5a12455121b8826ba270e26ef (commit)
       via  d1d4dac774c333141ac4a7203d8b243e18530669 (commit)
      from  c4d832ff9d98d6aca1390f7c44a79f9e4ba41ff7 (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=5ea0e34b8dbfc8c5a12455121b8826ba270e26ef
commit 5ea0e34b8dbfc8c5a12455121b8826ba270e26ef
Merge: c4d832f d1d4dac
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 05:13:52 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 4 05:13:52 2013 -0400

    Merge topic 'fix-genex-HEAD-target' into next
    
    d1d4dac 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=d1d4dac774c333141ac4a7203d8b243e18530669
commit d1d4dac774c333141ac4a7203d8b243e18530669
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jun 3 23:53:29 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 4 11:12:45 2013 +0200

    Genex: Fix the HEAD target used for evaluated expressions.
    
    If the expression $<TARGET_PROPERTY:prop> appears in the content
    of a target property, the target that prop is read from is
    the 'head target' of the expression. In contexts such as evaluating
    the content of a target property during generation, such
    as INCLUDE_DIRECTORIES, the 'head target' is the one on which the
    initial request was made.
    
    If evaluating a generator expression which is not a target property
    content, the target must be explicitly specified. Such contexts
    include add_custom_command and file(GENERATE). The content might
    then look like
    
     $<TARGET_PROPERTY:tgt,prop>
    
    However, as there is no HeadTarget set, any generator expressions
    evaluated as part of reading prop from tgt which do not specify
    the tgt directly report an error.
    
    Modify the logic of the TARGET_PROPERTY generator expression so
    that in such contexts, the 'head target' is set to the appropriate
    target which was first encountered.

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