[Cmake-commits] CMake branch, next, updated. v2.8.6-1822-g0e3d4ca
David Cole
david.cole at kitware.com
Wed Nov 9 06:38:21 EST 2011
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 0e3d4caa98eed443424a0f32b5d9f49abc94527c (commit)
via 0e721e512941c7f7aa51116c3291dfa198b5fccb (commit)
via 5675ec5e493e01e10d9ad8d8b60eac62033f31c2 (commit)
from fb48538ed184d1fd0cb0b9c748c823e56f8891f3 (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=0e3d4caa98eed443424a0f32b5d9f49abc94527c
commit 0e3d4caa98eed443424a0f32b5d9f49abc94527c
Merge: fb48538 0e721e5
Author: David Cole <david.cole at kitware.com>
AuthorDate: Wed Nov 9 06:38:18 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 9 06:38:18 2011 -0500
Merge topic 'findx11-dan-kegel-patch' into next
0e721e5 Modules: Add XRes to FindX11.cmake
5675ec5 KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e721e512941c7f7aa51116c3291dfa198b5fccb
commit 0e721e512941c7f7aa51116c3291dfa198b5fccb
Author: Dan Kegel <dank at kegel.com>
AuthorDate: Wed Nov 9 06:22:32 2011 -0500
Commit: David Cole <david.cole at kitware.com>
CommitDate: Wed Nov 9 06:22:32 2011 -0500
Modules: Add XRes to FindX11.cmake
diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake
index 9df3f01..04646c0 100644
--- a/Modules/FindX11.cmake
+++ b/Modules/FindX11.cmake
@@ -108,6 +108,7 @@ IF (UNIX)
FIND_PATH(X11_XShm_INCLUDE_PATH X11/extensions/XShm.h ${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xrandr_INCLUDE_PATH X11/extensions/Xrandr.h ${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xrender_INCLUDE_PATH X11/extensions/Xrender.h ${X11_INC_SEARCH_PATH})
+ FIND_PATH(X11_XRes_INCLUDE_PATH X11/extensions/XRes.h ${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xscreensaver_INCLUDE_PATH X11/extensions/scrnsaver.h ${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xshape_INCLUDE_PATH X11/extensions/shape.h ${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xutil_INCLUDE_PATH X11/Xutil.h ${X11_INC_SEARCH_PATH})
@@ -136,6 +137,7 @@ IF (UNIX)
FIND_LIBRARY(X11_Xpm_LIB Xpm ${X11_LIB_SEARCH_PATH})
FIND_LIBRARY(X11_Xrandr_LIB Xrandr ${X11_LIB_SEARCH_PATH})
FIND_LIBRARY(X11_Xrender_LIB Xrender ${X11_LIB_SEARCH_PATH})
+ FIND_LIBRARY(X11_XRes_LIB XRes ${X11_LIB_SEARCH_PATH})
FIND_LIBRARY(X11_Xscreensaver_LIB Xss ${X11_LIB_SEARCH_PATH})
FIND_LIBRARY(X11_Xt_LIB Xt ${X11_LIB_SEARCH_PATH})
FIND_LIBRARY(X11_XTest_LIB Xtst ${X11_LIB_SEARCH_PATH})
@@ -250,6 +252,11 @@ IF (UNIX)
SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xrender_INCLUDE_PATH})
ENDIF (X11_Xrender_INCLUDE_PATH AND X11_Xrender_LIB)
+ IF (X11_XRes_INCLUDE_PATH AND X11_XRes_LIB)
+ SET(X11_XRes_FOUND TRUE)
+ SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_XRes_INCLUDE_PATH})
+ ENDIF (X11_XRes_INCLUDE_PATH AND X11_XRes_LIB)
+
IF (X11_Xrandr_INCLUDE_PATH AND X11_Xrandr_LIB)
SET(X11_Xrandr_FOUND TRUE)
SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xrandr_INCLUDE_PATH})
@@ -424,6 +431,8 @@ IF (UNIX)
X11_Xdamage_INCLUDE_PATH
X11_Xrender_LIB
X11_Xrender_INCLUDE_PATH
+ X11_XRes_LIB
+ X11_XRes_INCLUDE_PATH
X11_Xxf86misc_LIB
X11_xf86misc_INCLUDE_PATH
X11_xf86vmode_INCLUDE_PATH
-----------------------------------------------------------------------
Summary of changes:
Modules/FindX11.cmake | 9 +++++++++
Source/kwsys/kwsysDateStamp.cmake | 2 +-
2 files changed, 10 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list