[Cmake-commits] CMake branch, next, updated. v2.8.9-73-g88892d2

[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  88892d2439e7f3f189351191e0f1f69f329acd70 (commit)
       via  97c338bac910d087eff9b160e3b68f2eeee482a5 (commit)
      from  a2f9303d7e7d1d11e89a0debdb585e67b0e498d8 (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=88892d2439e7f3f189351191e0f1f69f329acd70
commit 88892d2439e7f3f189351191e0f1f69f329acd70
Merge: a2f9303 97c338b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Aug 14 15:14:15 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 14 15:14:15 2012 -0400

    Merge topic 'FindX11-duplicate-includes-13316' into next
    
    97c338b FindX11: remove duplicates from X11 include path list (#13316)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97c338bac910d087eff9b160e3b68f2eeee482a5
commit 97c338bac910d087eff9b160e3b68f2eeee482a5
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Aug 13 19:39:30 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Aug 14 21:13:44 2012 +0200

    FindX11: remove duplicates from X11 include path list (#13316)
    
    Most if not all X11 includes are typically in the same directory, so this
    usually returns a huge list with only very few different entries.

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

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

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


hooks/post-receive
-- 
CMake