diff --git a/CMakeLists.txt b/CMakeLists.txt index d3e74b01..44c70753 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,7 +114,7 @@ find_package(DBusMenuQt) set_package_properties(DBusMenuQt PROPERTIES DESCRIPTION "Support for notification area menus via the DBusMenu protocol" URL "https://launchpad.net/libdbusmenu-qt" - TYPE REQUIRED + TYPE OPTIONAL ) ################# Disallow in-source build ################# diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt index fe6e37a5..0c7c1e28 100644 --- a/kdeui/CMakeLists.txt +++ b/kdeui/CMakeLists.txt @@ -26,7 +26,6 @@ include_directories( windowmanagement xmlgui ${CMAKE_CURRENT_BINARY_DIR}/util - ${DBUSMENUQT_INCLUDE_DIR} ) include_directories(${CMAKE_CURRENT_BINARY_DIR}/widgets) @@ -283,11 +282,32 @@ set(kdeui_LIB_SRCS xmlgui/kxmlguifactory_p.cpp xmlgui/kxmlguiversionhandler.cpp dialogs/kdeprintdialog.cpp - notifications/kstatusnotifieritem.cpp - notifications/kstatusnotifieritemdbus_p.cpp notifications/ksystemtrayicon.cpp ) +if(DBUSMENUQT_FOUND) + set(kdeui_LIB_SRCS + ${kdeui_LIB_SRCS + notifications/kstatusnotifieritem.cpp + notifications/kstatusnotifieritemdbus_p.cpp + ) + + include_directories(${DBUSMENUQT_INCLUDE_DIR}) + set(KDEUI_EXTRA_LIBS + ${KDEUI_EXTRA_LIBS} + ${DBUSMENUQT_LIBRARIES} + ) + + qt4_add_dbus_interface(kdeui_LIB_SRCS + notifications/org.kde.StatusNotifierWatcher.xml + statusnotifierwatcher_interface + ) + + qt4_add_dbus_adaptor(kdeui_LIB_SRCS + notifications/org.kde.StatusNotifierItem.xml + notifications/kstatusnotifieritemdbus_p.h KStatusNotifierItemDBus + ) +endif() if(Q_WS_X11) set(kdeui_LIB_SRCS @@ -346,21 +366,11 @@ qt4_add_dbus_interface(kdeui_LIB_SRCS jobviewifacev2 ) -qt4_add_dbus_interface(kdeui_LIB_SRCS - notifications/org.kde.StatusNotifierWatcher.xml - statusnotifierwatcher_interface -) - qt4_add_dbus_interface(kdeui_LIB_SRCS notifications/org.freedesktop.Notifications.xml notifications_interface ) -qt4_add_dbus_adaptor(kdeui_LIB_SRCS - notifications/org.kde.StatusNotifierItem.xml - notifications/kstatusnotifieritemdbus_p.h KStatusNotifierItemDBus -) - set(kglobalaccel_xml shortcuts/org.kde.KGlobalAccel.xml) set_source_files_properties(${kglobalaccel_xml} PROPERTIES INCLUDE "kglobalshortcutinfo_p.h") qt4_add_dbus_interface(kdeui_LIB_SRCS ${kglobalaccel_xml} kglobalaccel_interface ) @@ -384,7 +394,6 @@ target_link_libraries(kdeui PRIVATE ${KDEUI_EXTRA_LIBS} ${QT_QTNETWORK_LIBRARY} ${QT_QTSVG_LIBRARY} - ${DBUSMENUQT_LIBRARIES} )