diff options
Diffstat (limited to 'contrib/packages/rpm/el5/SOURCES/FindX11.cmake')
| -rw-r--r-- | contrib/packages/rpm/el5/SOURCES/FindX11.cmake | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/contrib/packages/rpm/el5/SOURCES/FindX11.cmake b/contrib/packages/rpm/el5/SOURCES/FindX11.cmake index 86335fcb..e8d70373 100644 --- a/contrib/packages/rpm/el5/SOURCES/FindX11.cmake +++ b/contrib/packages/rpm/el5/SOURCES/FindX11.cmake @@ -122,6 +122,7 @@ if (UNIX) find_path(X11_Xt_INCLUDE_PATH X11/Intrinsic.h ${X11_INC_SEARCH_PATH}) find_path(X11_Xv_INCLUDE_PATH X11/extensions/Xvlib.h ${X11_INC_SEARCH_PATH}) find_path(X11_XSync_INCLUDE_PATH X11/extensions/sync.h ${X11_INC_SEARCH_PATH}) + find_path(X11_xcb_INCLUDE_PATH X11/xcb.h ${X11_INC_SEARCH_PATH}) find_library(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}) @@ -152,6 +153,7 @@ if (UNIX) 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}) + find_library(X11_xcb_LIB xcb ${X11_LIB_SEARCH_PATH}) set(X11_LIBRARY_DIR "") if(X11_X11_LIB) @@ -333,6 +335,10 @@ if (UNIX) set(X11_SM_FOUND TRUE) endif() + if(X11_xcb_LIB AND X11_xcb_INCLUDE_PATH) + set(X11_xcb_FOUND TRUE) + endif() + # Most of the X11 headers will be in the same directories, avoid # creating a huge list of duplicates. if (X11_INCLUDE_DIR) @@ -431,6 +437,10 @@ if (UNIX) set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} ${X11_Xau_LIB}) endif () + if (X11_xcb_FOUND) + set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} ${X11_xcb_LIB}) + endif () + # Build the final list of libraries. set(X11_LIBRARIES ${X11_X_PRE_LIBS} ${X11_LIBRARIES} ${X11_X_EXTRA_LIBS}) @@ -506,6 +516,8 @@ if (UNIX) X11_ICE_INCLUDE_PATH X11_SM_LIB X11_SM_INCLUDE_PATH + X11_xcb_LIB + X11_xcb_INCLUDE_PATH X11_XSync_INCLUDE_PATH ) set(CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_SAVE}) |