Fix compilation on OpenSuSE 13.1 which puts xkbcommon.h in /usr/include/pkg/libxkbcommon/xkbcommon/

2014-03-29 09:30:45 +01:00 · 2014-03-29 09:30:45 +01:00 · 924b8b5a9e
commit 924b8b5a9e
parent 20bc3ff68b
2 changed files with 5 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -192,6 +192,10 @@ if(KWIN_BUILD_OPENGLES)
  include_directories(${OPENGLES_INCLUDE_DIR})
 endif()

+if (XKB_FOUND)
+  include_directories(${XKB_INCLUDE_DIR})
+endif()
+
 # for things that are also used by kwin libraries
 configure_file(libkwineffects/kwinconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkwineffects/kwinconfig.h )
 # for kwin internal things
--- a/cmake/modules/FindXKB.cmake
+++ b/cmake/modules/FindXKB.cmake
@ -33,11 +33,9 @@ if(NOT WIN32)

    find_path(XKB_INCLUDE_DIR
        NAMES
-            xkbcommon.h
+            xkbcommon/xkbcommon.h
        HINTS
            ${PKG_XKB_INCLUDE_DIRS}
-        PATH_SUFFIXES
-            xkbcommon
    )
    find_library(XKB_LIBRARY
        NAMES