summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorDan Kegel <dank@kegel.com>2011-11-09 11:22:32 (GMT)
committerDavid Cole <david.cole@kitware.com>2011-11-09 11:22:32 (GMT)
commit0e721e512941c7f7aa51116c3291dfa198b5fccb (patch)
tree91b0c74c73471f0ac980cc9571c34c097798b6fc /Modules
parent5675ec5e493e01e10d9ad8d8b60eac62033f31c2 (diff)
downloadCMake-0e721e512941c7f7aa51116c3291dfa198b5fccb.zip
CMake-0e721e512941c7f7aa51116c3291dfa198b5fccb.tar.gz
CMake-0e721e512941c7f7aa51116c3291dfa198b5fccb.tar.bz2
Modules: Add XRes to FindX11.cmake
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindX11.cmake9
1 files changed, 9 insertions, 0 deletions
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