[Cmake-commits] CMake branch, next, updated. v2.8.11-2499-ge784e79

[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  e784e79cd32755d240d3f56cf9d5fa150e7776b6 (commit)
       via  1127149d82e86e2267b0d06bde34e5cbec00008c (commit)
      from  7e3945bcdd2c1776aa63ab86bd33832e45ddbd29 (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=e784e79cd32755d240d3f56cf9d5fa150e7776b6
commit e784e79cd32755d240d3f56cf9d5fa150e7776b6
Merge: 7e3945b 1127149
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 05:51:43 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 4 05:51:43 2013 -0400

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

diff --cc Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index 088725b,bcfbe3c..6919261
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@@ -109,26 -109,12 +109,31 @@@ 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 "some_bogus_custom_tool \"$<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=1127149d82e86e2267b0d06bde34e5cbec00008c
commit 1127149d82e86e2267b0d06bde34e5cbec00008c
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:45:52 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..bcfbe3c 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@ -109,6 +109,11 @@ 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 "some_bogus_custom_tool \"$<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        |    5 +++++
 .../TargetIncludeDirectories/other.cpp}            |    5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)
 copy Tests/{TarTest/TestTarExec.cxx => IncludeDirectories/TargetIncludeDirectories/other.cpp} (53%)


hooks/post-receive
-- 
CMake