generic: make libdbusmenu-qt optional for appmenu and disable klipper if not found

disabling klipper in such case is temporary, until its dependency
on the menu library gets sorted out

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 391dbea..1faa558 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,7 +190,10 @@ macro_optional_add_subdirectory(qguiplatformplugin_kde)
 macro_optional_add_subdirectory(ksysguard)
 
 macro_optional_add_subdirectory(kcontrol)
-macro_optional_add_subdirectory(klipper)
+# TODO: support build without it
+if(DBUSMENUQT_FOUND)
+    macro_optional_add_subdirectory(klipper)
+endif()
 macro_optional_add_subdirectory(kmenuedit)
 macro_optional_add_subdirectory(krunner)
 macro_optional_add_subdirectory(solid-actions-kcm)

diff --git a/appmenu/CMakeLists.txt b/appmenu/CMakeLists.txt
index 351d212..062f020 100644 (file)
--- a/appmenu/CMakeLists.txt
+++ b/appmenu/CMakeLists.txt
@@ -1,11 +1,6 @@
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
 
-include_directories(${DBUSMENUQT_INCLUDE_DIR})
-
 set(kded_appmenu_SRCS
-    appmenu.cpp
-    menuimporter.cpp
-    appmenu_dbus.cpp
     menubutton.cpp
     menuwidget.cpp
     menubar.cpp
@@ -15,30 +10,44 @@ set(kded_appmenu_SRCS
     shadows.cpp
 )
 
-qt4_add_dbus_adaptor(kded_appmenu_SRCS
-    com.canonical.AppMenu.Registrar.xml
-    menuimporter.h MenuImporter
-    menuimporteradaptor
-    MenuImporterAdaptor
-)
+if(DBUSMENUEQT_FOUND)
+    set(kded_appmenu_SRCS
+        ${kded_appmenu_SRCS}
+        appmenu.cpp
+        appmenu_dbus.cpp
+        menuimporter.cpp
+    )
 
-qt4_add_dbus_adaptor(kded_appmenu_SRCS
-    org.kde.kded.appmenu.xml
-    appmenu_dbus.h
-    AppmenuDBus
-    appmenuadaptor
-    AppmenuAdaptor
-)
+    qt4_add_dbus_adaptor(kded_appmenu_SRCS
+        com.canonical.AppMenu.Registrar.xml
+        menuimporter.h
+        MenuImporter
+        menuimporteradaptor
+        MenuImporterAdaptor
+    )
+
+    qt4_add_dbus_adaptor(kded_appmenu_SRCS
+        org.kde.kded.appmenu.xml
+        appmenu_dbus.h
+        AppmenuDBus
+        appmenuadaptor
+        AppmenuAdaptor
+    )
+endif()
 
 kde4_add_plugin(kded_appmenu ${kded_appmenu_SRCS})
 
 target_link_libraries(kded_appmenu
     ${KDE4_KIO_LIBS}
     ${X11_LIBRARIES}
-    ${DBUSMENUQT_LIBRARIES}
     ${KDE4_PLASMA_LIBS}
 )
 
+if(DBUSMENUQT_FOUND)
+    target_link_libraries(kded_appmenu ${DBUSMENUQT_LIBRARIES})
+    include_directories(${DBUSMENUQT_INCLUDE_DIR})
+endif()
+
 install(
     TARGETS kded_appmenu
     DESTINATION ${PLUGIN_INSTALL_DIR}

diff --git a/kcontrol/keyboard/CMakeLists.txt b/kcontrol/keyboard/CMakeLists.txt
index 27eb3eb..095ec5f 100644 (file)
--- a/kcontrol/keyboard/CMakeLists.txt
+++ b/kcontrol/keyboard/CMakeLists.txt
@@ -14,7 +14,7 @@ set ( text_paint_LIB ${KDE4_PLASMA_LIBS} )
 
 ### kded daemon ###
 
-set( kded_keyboard_SRCS
+set(kded_keyboard_SRCS
     keyboard_daemon.cpp
     layout_memory.cpp
     layout_memory_persister.cpp
@@ -25,7 +25,7 @@ set( kded_keyboard_SRCS
     keyboard_hardware.cpp
     numlockx.c
     bindings.cpp
-# next are temporary for sys tray UI
+    # next are temporary for sys tray UI
     layout_tray_icon.cpp
     layouts_menu.cpp
     flags.cpp