[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3969-g5830175

[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  583017574c634697aa8f4d5f3395f244bae15821 (commit)
       via  892b9c5b490a50938180e727f6a7317d9861c24a (commit)
      from  f515810372c2240ca666abc7465ac998eb34556c (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=583017574c634697aa8f4d5f3395f244bae15821
commit 583017574c634697aa8f4d5f3395f244bae15821
Merge: f515810 892b9c5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 23 03:25:59 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 23 03:25:59 2013 -0400

    Merge topic 'fix-OLD-CMP0021' into next
    
    892b9c5 Exclude Ninja and Xcode from the CMP0021 test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=892b9c5b490a50938180e727f6a7317d9861c24a
commit 892b9c5b490a50938180e727f6a7317d9861c24a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 23 09:24:21 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Aug 23 09:24:21 2013 +0200

    Exclude Ninja and Xcode from the CMP0021 test
    
    They do not behave the same as the makefile generator with
    relative paths.

diff --git a/Tests/IncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/CMakeLists.txt
index 3493172..35ad8dc 100644
--- a/Tests/IncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -87,4 +87,6 @@ if (NOT incs STREQUAL ";/one/two")
   message(SEND_ERROR "Empty include_directories entry was not ignored.")
 endif()
 
-add_subdirectory(CMP0021)
+if(NOT CMAKE_GENERATOR STREQUAL Xcode AND NOT CMAKE_GENERATOR STREQUAL Ninja)
+  add_subdirectory(CMP0021)
+endif()

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

Summary of changes:
 Tests/IncludeDirectories/CMakeLists.txt |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake