From 237ff2afd6033b5f6aa0989374a5350186490f8b Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 24 Jul 2015 21:32:23 +0300 Subject: [PATCH] cmake: support XCB record library in FindXCB module --- cmake/modules/FindXCB.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cmake/modules/FindXCB.cmake b/cmake/modules/FindXCB.cmake index a065468f..859819f7 100644 --- a/cmake/modules/FindXCB.cmake +++ b/cmake/modules/FindXCB.cmake @@ -22,6 +22,7 @@ # XCB_RENDERUTIL_FOUND XCB_RENDERUTIL_INCLUDE_DIR XCB_RENDERUTIL_LIBRARIES # XCB_KEYSYMS_FOUND XCB_KEYSYMS_INCLUDE_DIR XCB_KEYSYMS_LIBRARIES # XCB_XTEST_FOUND XCB_XTEST_INCLUDE_DIR XCB_XTEST_LIBRARIES +# XCB_RECORD_FOUND XCB_RECORD_INCLUDE_DIR XCB_RECORD_LIBRARIES # # Copyright (c) 2012 Fredrik Höglund # @@ -39,7 +40,7 @@ IF (NOT WIN32) # in the FIND_PATH() and FIND_LIBRARY() calls FIND_PACKAGE(PkgConfig) PKG_CHECK_MODULES(PKG_XCB QUIET xcb xcb-util xcb-composite xcb-xfixes xcb-damage xcb-render xcb-randr - xcb-shape xcb-dri2 xcb-glx xcb-shm xcb-xv xcb-sync + xcb-shape xcb-dri2 xcb-glx xcb-shm xcb-xv xcb-sync xcb-record xcb-xtest xcb-icccm xcb-ewmh xcb-image xcb-renderutil xcb-keysyms) SET(XCB_DEFINITIONS ${PKG_XCB_CFLAGS}) @@ -57,6 +58,7 @@ IF (NOT WIN32) FIND_PATH(XCB_RENDERUTIL_INCLUDE_DIR NAMES xcb/xcb_renderutil.h HINTS ${PKG_XCB_INCLUDE_DIRS}) FIND_PATH(XCB_KEYSYMS_INCLUDE_DIR NAMES xcb/xcb_keysyms.h HINTS ${PKG_XCB_INCLUDE_DIRS}) FIND_PATH(XCB_XTEST_INCLUDE_DIR NAMES xcb/xtest.h HINTS ${PKG_XCB_INCLUDE_DIRS}) + FIND_PATH(XCB_RECORD_INCLUDE_DIR NAMES xcb/record.h HINTS ${PKG_XCB_INCLUDE_DIRS}) FIND_LIBRARY(XCB_XCB_LIBRARIES NAMES xcb HINTS ${PKG_XCB_LIBRARY_DIRS}) FIND_LIBRARY(XCB_COMPOSITE_LIBRARIES NAMES xcb-composite HINTS ${PKG_XCB_LIBRARY_DIRS}) @@ -71,18 +73,19 @@ IF (NOT WIN32) FIND_LIBRARY(XCB_RENDERUTIL_LIBRARIES NAMES xcb-render-util HINTS ${PKG_XCB_LIBRARY_DIRS}) FIND_LIBRARY(XCB_KEYSYMS_LIBRARIES NAMES xcb-keysyms HINTS ${PKG_XCB_LIBRARY_DIRS}) FIND_LIBRARY(XCB_XTEST_LIBRARIES NAMES xcb-xtest HINTS ${PKG_XCB_LIBRARY_DIRS}) + FIND_LIBRARY(XCB_RECORD_LIBRARIES NAMES xcb-record HINTS ${PKG_XCB_LIBRARY_DIRS}) set(XCB_INCLUDE_DIR ${XCB_XCB_INCLUDE_DIR} ${XCB_COMPOSITE_INCLUDE_DIR} ${XCB_XFIXES_INCLUDE_DIR} ${XCB_DAMAGE_INCLUDE_DIR} ${XCB_RENDER_INCLUDE_DIR} ${XCB_RANDR_INCLUDE_DIR} ${XCB_SHAPE_INCLUDE_DIR} ${XCB_SHM_INCLUDE_DIR} ${XCB_SYNC_INCLUDE_DIR} ${XCB_IMAGE_INCLUDE_DIR} ${XCB_RENDERUTIL_INCLUDE_DIR} ${XCB_KEYSYMS_INCLUDE_DIR} - ${XCB_XTEST_INCLUDE_DIR}) + ${XCB_XTEST_INCLUDE_DIR} ${XCB_RECORD_INCLUDE_DIR}) set(XCB_LIBRARIES ${XCB_XCB_LIBRARIES} ${XCB_COMPOSITE_LIBRARIES} ${XCB_XFIXES_LIBRARIES} ${XCB_DAMAGE_LIBRARIES} ${XCB_RENDER_LIBRARIES} ${XCB_RANDR_LIBRARIES} ${XCB_SHAPE_LIBRARIES} ${XCB_SHM_LIBRARIES} ${XCB_SYNC_LIBRARIES} ${XCB_IMAGE_LIBRARIES} ${XCB_RENDERUTIL_LIBRARIES} ${XCB_KEYSYMS_LIBRARIES} - ${XCB_XTEST_LIBRARIES}) + ${XCB_XTEST_LIBRARIES} ${XCB_RECORD_LIBRARIES}) list(REMOVE_DUPLICATES XCB_INCLUDE_DIR) @@ -101,6 +104,7 @@ IF (NOT WIN32) FIND_PACKAGE_HANDLE_STANDARD_ARGS(XCB_RENDERUTIL DEFAULT_MSG XCB_RENDERUTIL_LIBRARIES XCB_RENDERUTIL_INCLUDE_DIR) FIND_PACKAGE_HANDLE_STANDARD_ARGS(XCB_KEYSYMS DEFAULT_MSG XCB_KEYSYMS_LIBRARIES XCB_KEYSYMS_INCLUDE_DIR) FIND_PACKAGE_HANDLE_STANDARD_ARGS(XCB_XTEST DEFAULT_MSG XCB_XTEST_LIBRARIES XCB_XTEST_INCLUDE_DIR) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(XCB_RECORD DEFAULT_MSG XCB_RECORD_LIBRARIES XCB_RECORD_INCLUDE_DIR) FIND_PACKAGE_HANDLE_STANDARD_ARGS(XCB DEFAULT_MSG XCB_LIBRARIES XCB_INCLUDE_DIR) MARK_AS_ADVANCED( @@ -118,6 +122,7 @@ IF (NOT WIN32) XCB_RENDERUTIL_INCLUDE_DIR XCB_RENDERUTIL_LIBRARIES XCB_KEYSYMS_INCLUDE_DIR XCB_KEYSYMS_LIBRARIES XCB_XTEST_INCLUDE_DIR XCB_XTEST_LIBRARIES + XCB_RECORD_INCLUDE_DIR XCB_RECORD_LIBRARIES ) ENDIF (NOT WIN32) -- 2.11.0