[Cmake-commits] CMake branch, next, updated. v2.8.9-88-gd693705

[Rolf Eike Beer]

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  d6937051a5b09f703249fd3f9235394641f24747 (commit)
       via  dd784dde7290b3c8c2fda4bb34b60cd20bb75a91 (commit)
      from  b35dcb3de73ff3696ac2e494521d8688f0aa73cb (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=d6937051a5b09f703249fd3f9235394641f24747
commit d6937051a5b09f703249fd3f9235394641f24747
Merge: b35dcb3 dd784dd
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Aug 15 13:30:20 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 15 13:30:20 2012 -0400

    Merge topic 'FindX11-duplicate-includes-13316' into next
    
    dd784dd FindX11: avoid calling list(REMOVE_DUPLICATES) on an empty list


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd784dde7290b3c8c2fda4bb34b60cd20bb75a91
commit dd784dde7290b3c8c2fda4bb34b60cd20bb75a91
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Aug 15 19:28:50 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Aug 15 19:28:50 2012 +0200

    FindX11: avoid calling list(REMOVE_DUPLICATES) on an empty list

diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake
index 01ba478..e12dc0a 100644
--- a/Modules/FindX11.cmake
+++ b/Modules/FindX11.cmake
@@ -326,7 +326,9 @@ if (UNIX)
 
   # Most of the X11 headers will be in the same directories, avoid
   # creating a huge list of duplicates.
-  list(REMOVE_DUPLICATES X11_INCLUDE_DIR)
+  if (X11_INCLUDE_DIR)
+     list(REMOVE_DUPLICATES X11_INCLUDE_DIR)
+  endif ()
 
   # Deprecated variable for backwards compatibility with CMake 1.4
   if (X11_X11_INCLUDE_PATH AND X11_LIBRARIES)

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

Summary of changes:
 Modules/FindX11.cmake |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake