[Cmake-commits] CMake branch, next, updated. v2.8.11-2477-gee095cc

[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  ee095cc257897a3d3a2acd629a21ce5ed9cdea7a (commit)
       via  18c53b324418331c1c9cb7fc365d5ff5e1f7f945 (commit)
      from  075a0ec362f3c24721db0be33964ae8ce50d8c43 (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=ee095cc257897a3d3a2acd629a21ce5ed9cdea7a
commit ee095cc257897a3d3a2acd629a21ce5ed9cdea7a
Merge: 075a0ec 18c53b3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 05:08:11 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 4 05:08:11 2013 -0400

    Merge topic 'test-genex-HEAD-target' into next
    
    18c53b3 Test that evaluating target properties does not result in errors.

diff --cc Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index 088725b,ec9a8cf..66df404
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@@ -109,26 -109,14 +109,33 @@@ set_property(TARGET libbad APPEND PROPE
    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/bad"
  )
  
+ add_library(lib6 SHARED other.cpp)
+ add_library(lib7 SHARED other.cpp)
+ target_link_libraries(lib7 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:lib6>)
+ target_include_directories(lib7 PUBLIC $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:/lib7/include>)
+ add_custom_target(head_target_test "$<TARGET_PROPERTY:lib7,INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:lib7,INTERFACE_INCLUDE_DIRECTORIES>
+ ")
  
 +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")
  

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18c53b324418331c1c9cb7fc365d5ff5e1f7f945
commit 18c53b324418331c1c9cb7fc365d5ff5e1f7f945
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 10:52:56 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 4 11:07:46 2013 +0200

    Test that evaluating target properties does not result in errors.

diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index ad6671f..ec9a8cf 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@ -109,6 +109,13 @@ set_property(TARGET libbad APPEND PROPERTY
   INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/bad"
 )
 
+add_library(lib6 SHARED other.cpp)
+add_library(lib7 SHARED other.cpp)
+target_link_libraries(lib7 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:lib6>)
+target_include_directories(lib7 PUBLIC $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:/lib7/include>)
+add_custom_target(head_target_test "$<TARGET_PROPERTY:lib7,INCLUDE_DIRECTORIES>
+$<TARGET_PROPERTY:lib7,INTERFACE_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/other.cpp b/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
new file mode 100644
index 0000000..f388ef8
--- /dev/null
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
@@ -0,0 +1,4 @@
+
+int main() {
+  return 0;
+}

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

Summary of changes:
 .../TargetIncludeDirectories/CMakeLists.txt        |    7 +++++++
 .../TargetIncludeDirectories/other.cpp}            |    5 ++---
 2 files changed, 9 insertions(+), 3 deletions(-)
 copy Tests/{TarTest/TestTarExec.cxx => IncludeDirectories/TargetIncludeDirectories/other.cpp} (53%)


hooks/post-receive
-- 
CMake