diff options
| author | Martin Gräßlin <mgraesslin@kde.org> | 2013-03-14 10:37:58 +0100 |
|---|---|---|
| committer | Martin Gräßlin <mgraesslin@kde.org> | 2013-03-14 12:24:54 +0100 |
| commit | a667c2d45d041f2dc365a7ca82a27355aed0b1cc (patch) | |
| tree | 3b05109a50eaa5d644b599eff22fff9e737790aa | |
| parent | 34f89b45a9fd6fb6d79aec3ea8f9e87d474a984a (diff) | |
| download | extra-cmake-modules-a667c2d45d041f2dc365a7ca82a27355aed0b1cc.tar.gz extra-cmake-modules-a667c2d45d041f2dc365a7ca82a27355aed0b1cc.tar.bz2 | |
Add support for xcb-keysyms to FindXCB
Already used in kde-workspaces.
REVIEW: 109479
| -rw-r--r-- | find-modules/FindXCB.cmake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/find-modules/FindXCB.cmake b/find-modules/FindXCB.cmake index 7def4ebd..7e7e7016 100644 --- a/find-modules/FindXCB.cmake +++ b/find-modules/FindXCB.cmake @@ -27,6 +27,7 @@ # XCB_EWMH_FOUND XCB_EWMH_INCLUDE_DIR XCB_EWMH_LIBRARIES # XCB_IMAGE_FOUND XCB_IMAGE_INCLUDE_DIR XCB_IMAGE_LIBRARIES # XCB_RENDERUTIL_FOUND XCB_RENDERUTIL_INCLUDE_DIR XCB_RENDERUTIL_LIBRARIES +# XCB_KEYSYMS_FOUND XCB_KEYSYMS_INCLUDE_DIR XCB_KEYSYMS_LIBRARIES # # Copyright (c) 2011 Fredrik Höglund <fredrik@kde.org> # @@ -45,7 +46,7 @@ IF (NOT WIN32) 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-xtest xcb-icccm xcb-ewmh xcb-image xcb-renderutil) + xcb-xtest xcb-icccm xcb-ewmh xcb-image xcb-renderutil xcb-keysyms) SET(XCB_DEFINITIONS ${PKG_XCB_CFLAGS}) @@ -67,6 +68,7 @@ IF (NOT WIN32) FIND_PATH(XCB_EWMH_INCLUDE_DIR NAMES xcb/xcb_ewmh.h HINTS ${PKG_XCB_INCLUDE_DIRS}) FIND_PATH(XCB_IMAGE_INCLUDE_DIR NAMES xcb/xcb_image.h HINTS ${PKG_XCB_INCLUDE_DIRS}) 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_LIBRARY(XCB_XCB_LIBRARIES NAMES xcb HINTS ${PKG_XCB_LIBRARY_DIRS}) FIND_LIBRARY(XCB_UTIL_LIBRARIES NAMES xcb-util HINTS ${PKG_XCB_LIBRARY_DIRS}) @@ -86,20 +88,22 @@ IF (NOT WIN32) FIND_LIBRARY(XCB_EWMH_LIBRARIES NAMES xcb-ewmh HINTS ${PKG_XCB_LIBRARY_DIRS}) FIND_LIBRARY(XCB_IMAGE_LIBRARIES NAMES xcb-image HINTS ${PKG_XCB_LIBRARY_DIRS}) 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}) set(XCB_INCLUDE_DIR ${XCB_XCB_INCLUDE_DIR} ${XCB_UTIL_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_DRI2_INCLUDE_DIR} ${XCB_GLX_INCLUDE_DIR} ${XCB_SHM_INCLUDE_DIR} ${XCB_XV_INCLUDE_DIR} ${XCB_SYNC_INCLUDE_DIR} ${XCB_XTEST_INCLUDE_DIR} ${XCB_ICCCM_INCLUDE_DIR} - ${XCB_EWMH_INCLUDE_DIR} ${XCB_IMAGE_INCLUDE_DIR} ${XCB_RENDERUTIL_INCLUDE_DIR}) + ${XCB_EWMH_INCLUDE_DIR} ${XCB_IMAGE_INCLUDE_DIR} ${XCB_RENDERUTIL_INCLUDE_DIR} + ${XCB_KEYSYMS_INCLUDE_DIR}) set(XCB_LIBRARIES ${XCB_XCB_LIBRARIES} ${XCB_UTIL_LIBRARIES} ${XCB_COMPOSITE_LIBRARIES} ${XCB_XFIXES_LIBRARIES} ${XCB_DAMAGE_LIBRARIES} ${XCB_RENDER_LIBRARIES} ${XCB_RANDR_LIBRARIES} ${XCB_SHAPE_LIBRARIES} ${XCB_DRI2_LIBRARIES} ${XCB_GLX_LIBRARIES} ${XCB_SHM_LIBRARIES} ${XCB_XV_LIBRARIES} ${XCB_SYNC_LIBRARIES} ${XCB_XTEST_LIBRARIES} ${XCB_ICCCM_LIBRARIES} ${XCB_EWMH_LIBRARIES} ${XCB_IMAGE_LIBRARIES} - ${XCB_RENDERUTIL_LIBRARIES}) + ${XCB_RENDERUTIL_LIBRARIES} ${XCB_KEYSYMS_LIBRARIES}) list(REMOVE_DUPLICATES XCB_INCLUDE_DIR) @@ -124,6 +128,7 @@ IF (NOT WIN32) FIND_PACKAGE_HANDLE_STANDARD_ARGS(XCB_EWMH DEFAULT_MSG XCB_EWMH_LIBRARIES XCB_EWMH_INCLUDE_DIR) FIND_PACKAGE_HANDLE_STANDARD_ARGS(XCB_IMAGE DEFAULT_MSG XCB_IMAGE_LIBRARIES XCB_IMAGE_INCLUDE_DIR) 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) MARK_AS_ADVANCED( XCB_INCLUDE_DIR XCB_LIBRARIES @@ -145,6 +150,7 @@ IF (NOT WIN32) XCB_EWMH_INCLUDE_DIR XCB_EWMH_LIBRARIES XCB_IMAGE_INCLUDE_DIR XCB_IMAGE_LIBRARIES XCB_RENDERUTIL_INCLUDE_DIR XCB_RENDERUTIL_LIBRARIES + XCB_KEYSYMS_INCLUDE_DIR XCB_KEYSYMS_LIBRARIES ) ENDIF (NOT WIN32) |