diff options
| -rw-r--r-- | modules/FindX11.cmake | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 2e1095ac..95ad6a6e 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -28,8 +28,12 @@ if (UNIX) FIND_PATH(X11_Xlib_INCLUDE_PATH X11/Xlib.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xutil_INCLUDE_PATH X11/Xutil.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xaccess_INCLUDE_PATH X11/extensions/XKBstr.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xfixes_INCLUDE_PATH X11/extensions/Xfixes.h ${X11_INC_SEARCH_PATH}) FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH}) if(X11_X11_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) @@ -54,7 +58,15 @@ if (UNIX) if(X11_Xaccess_INCLUDE_PATH) set(X11_Xaccess_FOUND TRUE) endif(X11_Xaccess_INCLUDE_PATH) - + + if(X11_Xcomposite_INCLUDE_PATH) + set(X11_Xcomposite_FOUND TRUE) + endif(X11_Xcomposite_INCLUDE_PATH) + + if(X11_Xfixes_INCLUDE_PATH) + set(X11_Xfixes_FOUND TRUE) + endif(X11_Xfixes_INCLUDE_PATH) + # Deprecated variable for backwards compatibility with CMake 1.4 if(X11_X11_INCLUDE_PATH) if(X11_LIBRARIES) @@ -150,6 +162,11 @@ if (UNIX) X11_Xext_LIB X11_Xlib_INCLUDE_PATH X11_Xutil_INCLUDE_PATH + X11_Xcomposite_INCLUDE_PATH + X11_Xcomposite_LIB + X11_Xaccess_INCLUDE_PATH + X11_Xfixes_LIB + X11_Xfixes_INCLUDE_PATH X11_LIBRARIES ) |