[Cmake-commits] CMake branch, next, updated. v2.8.11-2340-g1fbfdaf

[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  1fbfdaf10967ada97e9f82f5b206e6834ae77b35 (commit)
       via  2cb27cf2a51354e9c079d592cce31182623ca0b2 (commit)
      from  74692d9161fea652f8b1e0dea03c8f0757183906 (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=1fbfdaf10967ada97e9f82f5b206e6834ae77b35
commit 1fbfdaf10967ada97e9f82f5b206e6834ae77b35
Merge: 74692d9 2cb27cf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 30 10:05:09 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 30 10:05:09 2013 -0400

    Merge topic 'test-INCLUDE_DIRECTORIES-genex-read' into next
    
    2cb27cf GenexEval: Fix evaluation of INCLUDE_DIRECTORIES target property.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cb27cf2a51354e9c079d592cce31182623ca0b2
commit 2cb27cf2a51354e9c079d592cce31182623ca0b2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 29 00:34:30 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 30 16:04:20 2013 +0200

    GenexEval: Fix evaluation of INCLUDE_DIRECTORIES target property.
    
    This property should come from the content of the property itself,
    plus the INTERFACE_INCLUDE_DIRECTORIES of the link *implementation*.
    
    In contrast, when the INTERFACE_INCLUDE_DIRECTORIES is evaluated for
    a target, the INTERFACE_INCLUDE_DIRECTORIES of the link *interface*
    is used.

diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index ad6671f..a80a58f 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@ -110,6 +110,25 @@ set_property(TARGET libbad APPEND PROPERTY
 )
 
 
+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>)
+
+
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp" "#include \"common.h\"\n")
 add_library(lib5 "${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp")
 
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;
+}
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/empty.cpp b/Tests/IncludeDirectories/TargetIncludeDirectories/empty.cpp
new file mode 100644
index 0000000..7279c5e
--- /dev/null
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/empty.cpp
@@ -0,0 +1,7 @@
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int empty(void)
+{
+  return 0;
+}

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

Summary of changes:
 .../TargetIncludeDirectories/CMakeLists.txt        |   19 +++++++++++++++++++
 .../{main.c => copy_includes.cpp}                  |    2 +-
 .../TargetIncludeDirectories}/empty.cpp            |    0
 3 files changed, 20 insertions(+), 1 deletions(-)
 copy Tests/IncludeDirectories/TargetIncludeDirectories/{main.c => copy_includes.cpp} (71%)
 copy Tests/{VariableUsage => IncludeDirectories/TargetIncludeDirectories}/empty.cpp (100%)


hooks/post-receive
-- 
CMake