[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2264-ge11a7ce

[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  e11a7cea7486cf214bece3a913b60402ffd52f75 (commit)
       via  79cec3da369d32761bac0ebe30edcf09c9d7db35 (commit)
      from  3e2180f121e5cdc7376c94a5067731a2e07bab57 (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=e11a7cea7486cf214bece3a913b60402ffd52f75
commit e11a7cea7486cf214bece3a913b60402ffd52f75
Merge: 3e2180f 79cec3d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 21 12:39:43 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 21 12:39:43 2013 -0500

    Merge topic 'interface-property-external-read' into next
    
    79cec3d Change the test to only use two include directories.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79cec3da369d32761bac0ebe30edcf09c9d7db35
commit 79cec3da369d32761bac0ebe30edcf09c9d7db35
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 21 18:35:54 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 21 18:35:54 2013 +0100

    Change the test to only use two include directories.
    
    The shell on the MSYS platforms transforms a single include directory
    to include a prefix, which is not what the test expects. As a workaround
    use two directories instead of one.

diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index 8a64dc2..fff7c87 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -81,7 +81,7 @@ target_link_libraries(empty2 LINK_PUBLIC empty3 empty4)
 target_link_libraries(empty3 LINK_PUBLIC empty2 empty4)
 
 add_library(empty5 empty.cpp)
-target_include_directories(empty5 PRIVATE /empty5/private)
+target_include_directories(empty5 PRIVATE /empty5/private1 /empty5/private2)
 
 add_custom_target(check-part2 ALL
   COMMAND ${CMAKE_COMMAND}
diff --git a/Tests/GeneratorExpression/check-part2.cmake b/Tests/GeneratorExpression/check-part2.cmake
index 177bace..3f7187c 100644
--- a/Tests/GeneratorExpression/check-part2.cmake
+++ b/Tests/GeneratorExpression/check-part2.cmake
@@ -33,4 +33,4 @@ check(test_target_includes4 "/empty1/public;/empty1/private;/empty2/public;/empt
 check(test_target_includes5 "/empty2/public;/empty3/public;/empty2/public;/empty4/public")
 check(test_target_includes6 "/empty3/public;/empty3/private;/empty2/public;/empty3/public;/empty4/public")
 check(test_target_includes7 "/empty1/public;/empty2/public;/empty3/public;/empty4/public")
-check(test_target_includes8 "/empty5/private")
+check(test_target_includes8 "/empty5/private1;/empty5/private2")

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

Summary of changes:
 Tests/GeneratorExpression/CMakeLists.txt    |    2 +-
 Tests/GeneratorExpression/check-part2.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake