From 104e89aff237e998dfa994ca2885c26abc49b22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 13 Mar 2014 17:52:26 +0100 Subject: [PATCH] Require xkbcommon for KWin's Wayland backend FindXKB.cmake module and if XKB is not found Wayland support is not enabled. --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e3a147af9..2202152bfc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,7 +196,7 @@ if(KWIN_HAVE_EGL) set(kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS} eglonxbackend.cpp) endif() -if(Wayland_Client_FOUND) +if(Wayland_Client_FOUND AND XKB_FOUND) set(kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS} wayland_backend.cpp) if(KWIN_HAVE_EGL AND Wayland_Egl_FOUND) set(kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS} egl_wayland_backend.cpp) @@ -274,6 +274,7 @@ set(kwin_WAYLAND_LIBS Wayland::Client Wayland::Cursor XCB::XTEST + XKB::XKB ) set(kwin_WAYLAND_EGL_LIBS @@ -306,7 +307,7 @@ set(kwinLibs ${kwin_OPENGL_LIBS} ) -if(Wayland_Client_FOUND) +if(Wayland_Client_FOUND AND XKB_FOUND) set(kwinLibs ${kwinLibs} ${kwin_WAYLAND_LIBS}) if(KWIN_HAVE_EGL AND Wayland_Egl_FOUND) set(kwinLibs ${kwinLibs} ${kwin_WAYLAND_EGL_LIBS})