[Cmake-commits] CMake branch, next, updated. v2.8.7-2637-g7733734

[Alexander Neundorf]

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  7733734dfd1f408ceb2b2dc350ebe93c034b5163 (commit)
       via  b2951624dc1f007b21f8b1ba12f5c60465172b37 (commit)
       via  e2042b68d36e0881bfc00f926a275dda3d6cbc9d (commit)
      from  4e006d6624ce569e2760b1ddc1f44838d3e2fe6a (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=7733734dfd1f408ceb2b2dc350ebe93c034b5163
commit 7733734dfd1f408ceb2b2dc350ebe93c034b5163
Merge: 4e006d6 b295162
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Thu Feb 16 03:42:14 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 16 03:42:14 2012 -0500

    Merge topic 'FindX11_SearchXxf86vm' into next
    
    b295162 fix #6976: FindX11 also searches for X11_Xxf86vm_LIB
    e2042b6 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2951624dc1f007b21f8b1ba12f5c60465172b37
commit b2951624dc1f007b21f8b1ba12f5c60465172b37
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Feb 16 09:36:27 2012 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Feb 16 09:36:27 2012 +0100

    fix #6976: FindX11 also searches for X11_Xxf86vm_LIB
    
    This contains a change, which changes the behaviour a bit:
    now X11_xf86vmode_FOUND is only set to TRUE and the include directory
    is added to X11_INCLUDE_DIR, if additionally to X11_xf86vmode_INCLUDE_PATH
    also X11_Xxf86vm_LIB has been found.
    I hope this doesn't cause regressions somewhere.
    
    Alex

diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake
index 1735bd4..76fb3c9 100644
--- a/Modules/FindX11.cmake
+++ b/Modules/FindX11.cmake
@@ -20,7 +20,7 @@
 #                X11_XShm_INCLUDE_PATH,         (in X11_Xext_LIB),  X11_XShm_FOUND
 #                X11_Xshape_INCLUDE_PATH,       (in X11_Xext_LIB),  X11_Xshape_FOUND
 #                X11_xf86misc_INCLUDE_PATH,     X11_Xxf86misc_LIB,  X11_xf86misc_FOUND
-#                X11_xf86vmode_INCLUDE_PATH,                        X11_xf86vmode_FOUND
+#                X11_xf86vmode_INCLUDE_PATH,    X11_Xxf86vm_LIB     X11_xf86vmode_FOUND
 #                X11_Xfixes_INCLUDE_PATH,       X11_Xfixes_LIB,     X11_Xfixes_FOUND
 #                X11_Xft_INCLUDE_PATH,          X11_Xft_LIB,        X11_Xft_FOUND
 #                X11_Xi_INCLUDE_PATH,           X11_Xi_LIB,         X11_Xi_FOUND
@@ -146,6 +146,7 @@ IF (UNIX)
   FIND_LIBRARY(X11_XTest_LIB Xtst            ${X11_LIB_SEARCH_PATH})
   FIND_LIBRARY(X11_Xv_LIB Xv                 ${X11_LIB_SEARCH_PATH})
   FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc   ${X11_LIB_SEARCH_PATH})
+  FIND_LIBRARY(X11_Xxf86vm_LIB Xxf86vm       ${X11_LIB_SEARCH_PATH})
 
   SET(X11_LIBRARY_DIR "")
   IF(X11_X11_LIB)
@@ -270,10 +271,10 @@ IF (UNIX)
      SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_xf86misc_INCLUDE_PATH})
   ENDIF (X11_xf86misc_INCLUDE_PATH  AND X11_Xxf86misc_LIB)
 
-  IF (X11_xf86vmode_INCLUDE_PATH)
+  IF (X11_xf86vmode_INCLUDE_PATH AND X11_Xxf86vm_LIB)
      SET(X11_xf86vmode_FOUND TRUE)
      SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_xf86vmode_INCLUDE_PATH})
-  ENDIF (X11_xf86vmode_INCLUDE_PATH)
+  ENDIF (X11_xf86vmode_INCLUDE_PATH AND X11_Xxf86vm_LIB)
 
   IF (X11_Xcursor_INCLUDE_PATH AND X11_Xcursor_LIB)
      SET(X11_Xcursor_FOUND TRUE)
@@ -443,6 +444,7 @@ IF (UNIX)
     X11_XRes_INCLUDE_PATH
     X11_Xxf86misc_LIB
     X11_xf86misc_INCLUDE_PATH
+    X11_Xxf86vm_LIB
     X11_xf86vmode_INCLUDE_PATH
     X11_Xi_LIB
     X11_Xi_INCLUDE_PATH

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

Summary of changes:
 Modules/FindX11.cmake             |    8 +++++---
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake