[Cmake-commits] CMake branch, next, updated. v2.8.11-2322-g764f383

[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  764f383fcf6544b3dff151b51853702e51dae717 (commit)
       via  bc3acfd5de4be11e6746337b2627188521b4d113 (commit)
       via  5e31f17abff9f1cb2c0beea0a3115db16b71ad16 (commit)
      from  51d268e010867107da4a5dbb4ff7bf0efc9cbe57 (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=764f383fcf6544b3dff151b51853702e51dae717
commit 764f383fcf6544b3dff151b51853702e51dae717
Merge: 51d268e bc3acfd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 30 06:36:56 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 30 06:36:56 2013 -0400

    Merge topic 'fix-INCLUDE_DIRECTORIES-genex-read' into next
    
    bc3acfd Fix up logic.
    5e31f17 Add test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc3acfd5de4be11e6746337b2627188521b4d113
commit bc3acfd5de4be11e6746337b2627188521b4d113
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 30 12:34:43 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 30 12:35:09 2013 +0200

    Fix up logic.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index e3fdf71..d076cc1 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -630,7 +630,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
               + (sizeof(targetPropertyTransitiveWhitelist) /
               sizeof(*targetPropertyTransitiveWhitelist));
     if (std::find_if(transBegin, transEnd,
-              TransitiveWhitelistCompare(interfacePropertyName)) != transEnd)
+              TransitiveWhitelistCompare(propertyName)) != transEnd)
       {
       const cmTarget::LinkInterface *iface = target->GetLinkInterface(
                                                     context->Config,
@@ -644,7 +644,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         }
       }
     else if (std::find_if(transBegin, transEnd,
-              TransitiveWhitelistCompare(propertyName)) != transEnd)
+              TransitiveWhitelistCompare(interfacePropertyName)) != transEnd)
       {
       const cmTarget::LinkImplementation *impl = target->GetLinkImplementation(
                                                     context->Config,

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e31f17abff9f1cb2c0beea0a3115db16b71ad16
commit 5e31f17abff9f1cb2c0beea0a3115db16b71ad16
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 30 12:16:19 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 30 12:35:00 2013 +0200

    Add test.

diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index 50f12ee..e9dd4df 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@ -144,3 +144,21 @@ set_property(TARGET TargetIncludeDirectories_C
   "$<$<LINK_LANGUAGE:C>:${CMAKE_CURRENT_BINARY_DIR}/good>"
   "$<$<STREQUAL:$<LINK_LANGUAGE>,C>:${CMAKE_CURRENT_BINARY_DIR}/othergood/>"
 )
+
+add_library(includes_source_good ../empty.cpp)
+target_include_directories(includes_source_good
+  INTERFACE
+    "${CMAKE_CURRENT_BINARY_DIR}/good"
+    "${CMAKE_CURRENT_BINARY_DIR}/othergood/"
+)
+add_library(includes_source_bad ../empty.cpp)
+target_include_directories(includes_source_bad
+  INTERFACE
+    "${CMAKE_CURRENT_BINARY_DIR}/bad"
+)
+
+add_library(includes_proxy SHARED ../empty.cpp)
+target_link_libraries(includes_proxy includes_source_good)
+target_link_libraries(includes_proxy LINK_INTERFACE_LIBRARIES includes_source_bad)
+add_executable(copy_includes copy_includes.cpp)
+target_include_directories(copy_includes PRIVATE $<TARGET_PROPERTY:includes_proxy,INCLUDE_DIRECTORIES>)
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/copy_includes.cpp b/Tests/IncludeDirectories/TargetIncludeDirectories/copy_includes.cpp
new file mode 100644
index 0000000..fed4c03
--- /dev/null
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/copy_includes.cpp
@@ -0,0 +1,7 @@
+
+#include "common.h"
+
+int main()
+{
+  return 0;
+}

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

Summary of changes:
 Source/cmGeneratorExpressionEvaluator.cxx          |    4 ++--
 .../TargetIncludeDirectories/CMakeLists.txt        |   18 ++++++++++++++++++
 .../{main.c => copy_includes.cpp}                  |    2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)
 copy Tests/IncludeDirectories/TargetIncludeDirectories/{main.c => copy_includes.cpp} (71%)


hooks/post-receive
-- 
CMake