[Cmake-commits] CMake branch, next, updated. v2.8.11-2486-gaa343b9

[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  aa343b9cf52ff1bf2a19977311101d6314b33160 (commit)
       via  02e9888b64ad50a78b4589c65a9d865f72f3f2fb (commit)
      from  5ea0e34b8dbfc8c5a12455121b8826ba270e26ef (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=aa343b9cf52ff1bf2a19977311101d6314b33160
commit aa343b9cf52ff1bf2a19977311101d6314b33160
Merge: 5ea0e34 02e9888
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 05:18:57 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 4 05:18:57 2013 -0400

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

diff --cc Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index 66df404,ad6671f..088725b
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@@ -109,33 -109,7 +109,26 @@@ 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=02e9888b64ad50a78b4589c65a9d865f72f3f2fb
commit 02e9888b64ad50a78b4589c65a9d865f72f3f2fb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 4 11:17:44 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 4 11:17:44 2013 +0200

    Revert "Test that evaluating target properties does not result in errors."
    
    This reverts commit 18c53b324418331c1c9cb7fc365d5ff5e1f7f945.

diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index ec9a8cf..ad6671f 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@ -109,13 +109,6 @@ 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
deleted file mode 100644
index f388ef8..0000000
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-int main() {
-  return 0;
-}

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

Summary of changes:
 .../TargetIncludeDirectories/CMakeLists.txt        |    7 -------
 .../TargetIncludeDirectories/other.cpp             |    4 ----
 2 files changed, 0 insertions(+), 11 deletions(-)
 delete mode 100644 Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp


hooks/post-receive
-- 
CMake