From 5428a1526602d3d1212ec2bceedc941678631d42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 20 Mar 2014 12:54:24 +0100 Subject: [PATCH] [kwin] Fix build if Wayland is found, but xkbcommon is missing It enabled the Wayland build, but it should be disabled if xkbcommon is missing. Thanks to Project Neon for finding this issue. --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30cb96d87b..3807b20ffc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -207,11 +207,12 @@ 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 -set(HAVE_WAYLAND ${Wayland_Client_FOUND}) -if(${HAVE_WAYLAND}) +if(Wayland_Client_FOUND AND XKB_FOUND) + set(HAVE_WAYLAND ${Wayland_Client_FOUND}) set(HAVE_XKB ${XKB_FOUND}) set(HAVE_WAYLAND_EGL ${Wayland_Egl_FOUND}) else() + set(HAVE_WAYLAND FALSE) set(HAVE_XKB FALSE) set(HAVE_WAYLAND_EGL FALSE) endif()