[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] /: Find xcb_icccm and link it in KWin core
From:       Martin_Gräßlin <mgraesslin () kde ! org>
Date:       2013-05-28 9:56:12
Message-ID: 20130528095612.433BAA6078 () git ! kde ! org
[Download RAW message or body]

Git commit 30c2461f96f44746bf1813184092db950e9f8af2 by Martin Gr=C3=A4=C3=
=9Flin.
Committed on 03/05/2013 at 08:56.
Pushed by graesslin into branch 'master'.

Find xcb_icccm and link it in KWin core

We need it for porting some aspects of Client to XCB.

M  +9    -2    cmake/modules/FindXCB.cmake
M  +1    -0    kwin/CMakeLists.txt

http://commits.kde.org/kde-workspace/30c2461f96f44746bf1813184092db950e9f8a=
f2

diff --git a/cmake/modules/FindXCB.cmake b/cmake/modules/FindXCB.cmake
index 98e0ecc..7e95ff1 100644
--- a/cmake/modules/FindXCB.cmake
+++ b/cmake/modules/FindXCB.cmake
@@ -21,6 +21,7 @@
 #   XCB_IMAGE_FOUND      XCB_IMAGE_INCLUDE_DIR      XCB_IMAGE_LIBRARIES
 #   XCB_RENDERUTIL_FOUND XCB_RENDERUTIL_INCLUDE_DIR XCB_RENDERUTIL_LIBRARI=
ES
 #   XCB_KEYSYMS_FOUND    XCB_KEYSYMS_INCLUDE_DIR    XCB_KEYSYMS_LIBRARIES
+#   XCB_ICCCM_FOUND      XCB_ICCCM_INCLUDE_DIR      XCB_ICCCM_LIBRARIES
 #
 # Copyright (c) 2012 Fredrik H=C3=B6glund <fredrik@kde.org>
 #
@@ -55,6 +56,7 @@ IF (NOT WIN32)
   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_PATH(XCB_ICCCM_INCLUDE_DIR       NAMES xcb/xcb_icccm.h       HINTS =
${PKG_XCB_INCLUDE_DIRS})
 =

   FIND_LIBRARY(XCB_XCB_LIBRARIES         NAMES xcb              HINTS ${PK=
G_XCB_LIBRARY_DIRS})
   FIND_LIBRARY(XCB_COMPOSITE_LIBRARIES   NAMES xcb-composite    HINTS ${PK=
G_XCB_LIBRARY_DIRS})
@@ -68,16 +70,19 @@ IF (NOT WIN32)
   FIND_LIBRARY(XCB_IMAGE_LIBRARIES       NAMES xcb-image        HINTS ${PK=
G_XCB_LIBRARY_DIRS})
   FIND_LIBRARY(XCB_RENDERUTIL_LIBRARIES  NAMES xcb-render-util  HINTS ${PK=
G_XCB_LIBRARY_DIRS})
   FIND_LIBRARY(XCB_KEYSYMS_LIBRARIES     NAMES xcb-keysyms      HINTS ${PK=
G_XCB_LIBRARY_DIRS})
+  FIND_LIBRARY(XCB_ICCCM_LIBRARIES       NAMES xcb-icccm        HINTS ${PK=
G_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_INCLU=
DE_DIR}
-          ${XCB_IMAGE_INCLUDE_DIR} ${XCB_RENDERUTIL_INCLUDE_DIR} ${XCB_KEY=
SYMS_INCLUDE_DIR})
+          ${XCB_IMAGE_INCLUDE_DIR} ${XCB_RENDERUTIL_INCLUDE_DIR} ${XCB_KEY=
SYMS_INCLUDE_DIR}
+          ${XCB_ICCCM_INCLUDE_DIR})
 =

   set(XCB_LIBRARIES ${XCB_XCB_LIBRARIES} ${XCB_COMPOSITE_LIBRARIES} ${XCB_=
XFIXES_LIBRARIES}
           ${XCB_DAMAGE_LIBRARIES} ${XCB_RENDER_LIBRARIES} ${XCB_RANDR_LIBR=
ARIES}
           ${XCB_SHAPE_LIBRARIES} ${XCB_SHM_LIBRARIES} ${XCB_SYNC_LIBRARIES}
-          ${XCB_IMAGE_LIBRARIES} ${XCB_RENDERUTIL_LIBRARIES} ${XCB_KEYSYMS=
_LIBRARIES})
+          ${XCB_IMAGE_LIBRARIES} ${XCB_RENDERUTIL_LIBRARIES} ${XCB_KEYSYMS=
_LIBRARIES}
+          ${XCB_ICCCM_LIBRARIES})
 =

   list(REMOVE_DUPLICATES XCB_INCLUDE_DIR)
 =

@@ -95,6 +100,7 @@ IF (NOT WIN32)
   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_RENDE=
RUTIL_LIBRARIES  XCB_RENDERUTIL_INCLUDE_DIR)
   FIND_PACKAGE_HANDLE_STANDARD_ARGS(XCB_KEYSYMS     DEFAULT_MSG  XCB_KEYSY=
MS_LIBRARIES     XCB_KEYSYMS_INCLUDE_DIR)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(XCB_ICCCM       DEFAULT_MSG  XCB_ICCCM=
_LIBRARIES       XCB_ICCCM_INCLUDE_DIR)
   FIND_PACKAGE_HANDLE_STANDARD_ARGS(XCB             DEFAULT_MSG  XCB_LIBRA=
RIES             XCB_INCLUDE_DIR)
 =

   MARK_AS_ADVANCED(
@@ -111,6 +117,7 @@ IF (NOT WIN32)
         XCB_IMAGE_INCLUDE_DIR       XCB_IMAGE_LIBRARIES
         XCB_RENDERUTIL_INCLUDE_DIR  XCB_RENDERUTIL_LIBRARIES
         XCB_KEYSYMS_INCLUDE_DIR     XCB_KEYSYMS_LIBRARIES
+        XCB_ICCCM_INCLUDE_DIR       XCB_ICCCM_LIBRARIES
   )
 =

 ENDIF (NOT WIN32)
diff --git a/kwin/CMakeLists.txt b/kwin/CMakeLists.txt
index 09c1a00..6570b1a 100644
--- a/kwin/CMakeLists.txt
+++ b/kwin/CMakeLists.txt
@@ -245,6 +245,7 @@ set(kwin_XCB_LIBS
     ${XCB_RENDER_LIBRARIES}
     ${XCB_RANDR_LIBRARIES}
     ${XCB_KEYSYMS_LIBRARIES}
+    ${XCB_ICCCM_LIBRARIES}
 )
 =

 set(kwin_OPENGL_LIBS )

[prev in list] [next in list] [prev in thread] [next in thread]