From 7382b6d8b1b062e986ac2a12eefa88458733a832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 18 Mar 2014 12:18:15 +0100 Subject: [PATCH] [kwin] Resolve path to ksmserver dbus interfaces through KWIN_SOURCE_DIR This is a temporary solution to have less dependencies on KDEBASE_WORKSPACE_SOURCE_DIR. Once kde-workspace is going to be splitted this won't work, we need a proper way to find the dbus interfaces provided by ksmserver. Note: for appmenu the same problem exists, but doesn't affect us once we are splitted as we can turn off the usage through a build option. So for a splitted kde-workspace the appmenu dependency can just be temporarily be removed. --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ccd4dc359..065b44b27a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,10 +221,12 @@ qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml dbusinterface.h KWin::D qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.kwin.Compositing.xml composite.h KWin::Compositor ) qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.kwin.Effects.xml effects.h KWin::EffectsHandlerImpl ) +# TODO: we need a better way to find the dbus interfaces provided by ksmserver +set(KSMSERVER_SOURCE_DIR ${KWIN_SOURCE_DIR}/../ksmserver/) qt5_add_dbus_interface( kwin_KDEINIT_SRCS - ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml ksmserver_interface) + ${KSMSERVER_SOURCE_DIR}/org.kde.KSMServerInterface.xml ksmserver_interface) qt5_add_dbus_interface( kwin_KDEINIT_SRCS - ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml screenlocker_interface) + ${KSMSERVER_SOURCE_DIR}/screenlocker/dbus/org.freedesktop.ScreenSaver.xml screenlocker_interface) qt5_add_resources( kwin_KDEINIT_SRCS resources.qrc )