Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: make libdbusmenu-qt optional

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2015-11-12 17:35:14 +02:00
parent 61212b4527
commit d7255aa3b1
2 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -114,7 +114,7 @@ find_package(DBusMenuQt)
set_package_properties(DBusMenuQt PROPERTIES set_package_properties(DBusMenuQt PROPERTIES
DESCRIPTION "Support for notification area menus via the DBusMenu protocol" DESCRIPTION "Support for notification area menus via the DBusMenu protocol"
URL "https://launchpad.net/libdbusmenu-qt" URL "https://launchpad.net/libdbusmenu-qt"
TYPE REQUIRED TYPE OPTIONAL
) )
################# Disallow in-source build ################# ################# Disallow in-source build #################

37
kdeui/CMakeLists.txt
View file

@ -26,7 +26,6 @@ include_directories(
windowmanagement windowmanagement
xmlgui xmlgui
${CMAKE_CURRENT_BINARY_DIR}/util ${CMAKE_CURRENT_BINARY_DIR}/util
${DBUSMENUQT_INCLUDE_DIR}
) )
include_directories(${CMAKE_CURRENT_BINARY_DIR}/widgets) include_directories(${CMAKE_CURRENT_BINARY_DIR}/widgets)
@ -283,11 +282,32 @@ set(kdeui_LIB_SRCS
xmlgui/kxmlguifactory_p.cpp xmlgui/kxmlguifactory_p.cpp
xmlgui/kxmlguiversionhandler.cpp xmlgui/kxmlguiversionhandler.cpp
dialogs/kdeprintdialog.cpp dialogs/kdeprintdialog.cpp
notifications/kstatusnotifieritem.cpp
notifications/kstatusnotifieritemdbus_p.cpp
notifications/ksystemtrayicon.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) if(Q_WS_X11)
set(kdeui_LIB_SRCS set(kdeui_LIB_SRCS
@ -346,21 +366,11 @@ qt4_add_dbus_interface(kdeui_LIB_SRCS
jobviewifacev2 jobviewifacev2
) )
qt4_add_dbus_interface(kdeui_LIB_SRCS
notifications/org.kde.StatusNotifierWatcher.xml
statusnotifierwatcher_interface
)
qt4_add_dbus_interface(kdeui_LIB_SRCS qt4_add_dbus_interface(kdeui_LIB_SRCS
notifications/org.freedesktop.Notifications.xml notifications/org.freedesktop.Notifications.xml
notifications_interface 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(kglobalaccel_xml shortcuts/org.kde.KGlobalAccel.xml)
set_source_files_properties(${kglobalaccel_xml} PROPERTIES INCLUDE "kglobalshortcutinfo_p.h") set_source_files_properties(${kglobalaccel_xml} PROPERTIES INCLUDE "kglobalshortcutinfo_p.h")
qt4_add_dbus_interface(kdeui_LIB_SRCS ${kglobalaccel_xml} kglobalaccel_interface ) qt4_add_dbus_interface(kdeui_LIB_SRCS ${kglobalaccel_xml} kglobalaccel_interface )
@ -384,7 +394,6 @@ target_link_libraries(kdeui PRIVATE
${KDEUI_EXTRA_LIBS} ${KDEUI_EXTRA_LIBS}
${QT_QTNETWORK_LIBRARY} ${QT_QTNETWORK_LIBRARY}
${QT_QTSVG_LIBRARY} ${QT_QTSVG_LIBRARY}
${DBUSMENUQT_LIBRARIES}
) )