File kickoff-cmake.diff of Package KDE
diff -Nur kde3-kdebase-master.orig/kicker/applets/launcher/CMakeLists.txt kde3-kdebase-master/kicker/applets/launcher/CMakeLists.txt
--- kde3-kdebase-master.orig/kicker/applets/launcher/CMakeLists.txt 2014-02-08 17:59:01.269417601 +0200
+++ kde3-kdebase-master/kicker/applets/launcher/CMakeLists.txt 2014-02-09 00:48:44.000000000 +0200
@@ -39,7 +39,7 @@
EMBED
kicker_core-static kicker_buttons-static kicker_ui-static
LINK
- dmctl-static kickermain-shared kutils-shared kabc-shared
+ dmctl-static kickoffsearch_interfaces-shared kickermain-shared kutils-shared kabc-shared
DEPENDENCIES libkicker-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff -Nur kde3-kdebase-master.orig/kicker/kicker/buttons/CMakeLists.txt kde3-kdebase-master/kicker/kicker/buttons/CMakeLists.txt
--- kde3-kdebase-master.orig/kicker/kicker/buttons/CMakeLists.txt 2014-02-08 17:59:01.253417574 +0200
+++ kde3-kdebase-master/kicker/kicker/buttons/CMakeLists.txt 2014-02-08 22:20:34.000000000 +0200
@@ -38,10 +38,26 @@
servicebutton.cpp bookmarksbutton.cpp browserbutton.cpp
desktopbutton.cpp extensionbutton.cpp
kbutton.cpp nonkdeappbutton.cpp servicemenubutton.cpp
- urlbutton.cpp windowlistbutton.cpp
+ urlbutton.cpp windowlistbutton.cpp knewbutton.cpp
)
kde_add_library( ${target} STATIC_PIC AUTOMOC
SOURCES ${${target}_SRCS}
DEPENDENCIES kicker_core-static kicker-static kicker-shared
)
+
+# this hack is necessary to avoid a circular dependency beween kicker_buttons and kicker_ui
+set( menu_base_ui ${CMAKE_CURRENT_SOURCE_DIR}/../ui/kmenubase.ui )
+
+add_custom_command( OUTPUT kmenubase.h
+ COMMAND ${CMAKE_COMMAND}
+ ARGS
+ -DPLUGIN_DIR:FILEPATH="${PLUGIN_INSTALL_DIR}/plugins/designer"
+ -DUIC_EXECUTABLE:FILEPATH="${QT_UIC_EXECUTABLE}"
+ -DUI_FILE:FILEPATH="${menu_base_ui}"
+ -DH_FILE:FILEPATH="kmenubase.h"
+ -DCPP_FILE:FILEPATH="kmenubase.cpp"
+ -P "${CMAKE_MODULE_PATH}/uic.cmake"
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../ui/kmenubase.ui )
+
+set_property( SOURCE knewbutton.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/kmenubase.h )
diff -Nur kde3-kdebase-master.orig/kicker/kicker/CMakeLists.txt kde3-kdebase-master/kicker/kicker/CMakeLists.txt
--- kde3-kdebase-master.orig/kicker/kicker/CMakeLists.txt 2014-02-08 17:59:01.253417574 +0200
+++ kde3-kdebase-master/kicker/kicker/CMakeLists.txt 2014-02-09 00:48:14.000000000 +0200
@@ -14,6 +14,7 @@
add_subdirectory( core )
add_subdirectory( ui )
add_subdirectory( buttons )
+add_subdirectory( interfaces )
include_directories(
${CMAKE_SOURCE_DIR}/libkonq
@@ -49,5 +50,5 @@
kde_add_kdeinit_executable( kicker
SOURCES dummy.cpp
EMBED kicker_core-static
- LINK kicker_buttons-static kicker_ui-static dmctl-static kickermain-shared kabc-shared kutils-shared
+ LINK kicker_buttons-static kicker_ui-static dmctl-static kickoffsearch_interfaces-shared kickermain-shared konq-shared kabc-shared kutils-shared
)
diff -Nur kde3-kdebase-master.orig/kicker/kicker/core/CMakeLists.txt kde3-kdebase-master/kicker/kicker/core/CMakeLists.txt
--- kde3-kdebase-master.orig/kicker/kicker/core/CMakeLists.txt 2014-02-08 17:59:01.253417574 +0200
+++ kde3-kdebase-master/kicker/kicker/core/CMakeLists.txt 2014-02-08 22:17:38.000000000 +0200
@@ -30,6 +30,7 @@
##### kicker_core (static) ######################
+
kde_add_library( kicker_core STATIC_PIC AUTOMOC
SOURCES
extensionSettings.kcfgc main.cpp kicker.cpp kicker.skel
@@ -41,3 +42,19 @@
DEPENDENCIES libkicker-shared
LINK konq-shared
)
+
+# this hack is necessary to avoid a circular dependency beween kicker_core and kicker_ui
+set( menu_base_ui ${CMAKE_CURRENT_SOURCE_DIR}/../ui/kmenubase.ui )
+
+add_custom_command( OUTPUT kmenubase.h
+ COMMAND ${CMAKE_COMMAND}
+ ARGS
+ -DPLUGIN_DIR:FILEPATH="${PLUGIN_INSTALL_DIR}/plugins/designer"
+ -DUIC_EXECUTABLE:FILEPATH="${QT_UIC_EXECUTABLE}"
+ -DUI_FILE:FILEPATH="${menu_base_ui}"
+ -DH_FILE:FILEPATH="kmenubase.h"
+ -DCPP_FILE:FILEPATH="kmenubase.cpp"
+ -P "${CMAKE_MODULE_PATH}/uic.cmake"
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../ui/kmenubase.ui )
+
+set_property( SOURCE kicker.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/kmenubase.h )
diff -Nur kde3-kdebase-master.orig/kicker/kicker/interfaces/CMakeLists.txt kde3-kdebase-master/kicker/kicker/interfaces/CMakeLists.txt
--- kde3-kdebase-master.orig/kicker/kicker/interfaces/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200
+++ kde3-kdebase-master/kicker/kicker/interfaces/CMakeLists.txt 2014-02-08 23:18:44.000000000 +0200
@@ -0,0 +1,30 @@
+#################################################
+#
+# (C) 2014 Serghei Amelian
+# serghei (DOT) amelian (AT) gmail.com
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${KDE_INCLUDE_DIR}
+ ${QT_INCLUDE_DIR} )
+
+
+##### other data ################################
+
+install( FILES kickoffsearchplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+
+
+##### kickoffsearch_interfaces (static) #########
+
+kde_add_library( kickoffsearch_interfaces SHARED AUTOMOC
+ SOURCES kickoff-search-plugin.cpp kickoffsearchinterface.cpp
+ VERSION 0.0.0
+ LINK kdecore-shared
+ DESTINATION ${LIB_INSTALL_DIR}
+)
diff -Nur kde3-kdebase-master.orig/kicker/kicker/ui/CMakeLists.txt kde3-kdebase-master/kicker/kicker/ui/CMakeLists.txt
--- kde3-kdebase-master.orig/kicker/kicker/ui/CMakeLists.txt 2014-02-08 17:59:01.253417574 +0200
+++ kde3-kdebase-master/kicker/kicker/ui/CMakeLists.txt 2014-02-09 00:47:28.000000000 +0200
@@ -9,6 +9,9 @@
#
#################################################
+kde_search_module( DBUS dbus-1 )
+kde_search_module( LAZY lazy )
+
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
@@ -21,6 +24,7 @@
${CMAKE_SOURCE_DIR}/libkonq
${KDE_INCLUDE_DIR}
${QT_INCLUDE_DIR}
+ ${DBUS_INCLUDE_DIRS}
)
@@ -35,6 +39,11 @@
addextension_mnu.cpp extensionop_mnu.cpp recentapps.cpp
browser_dlg.cpp removeapplet_mnu.cpp removeextension_mnu.cpp
removecontainer_mnu.cpp removebutton_mnu.cpp popupmenutitle.cpp
- hidebutton.cpp addappletvisualfeedback.cpp
- DEPENDENCIES kicker_core-static kickermain-static
+ hidebutton.cpp addappletvisualfeedback.cpp kmenubase.ui k_mnu_stub.cpp
+ k_new_mnu.cpp kmenuitembase.ui flipscrollview.cpp itemview.cpp
+ query.cpp kickoff_bar.cpp mykickoffsearchinterface.cpp
+ media_watcher.skel media_watcher.cpp
+ LINK
+ ${LAZY_LIBRARIES} kdedbus-shared
+ DEPENDENCIES kickermain-static kicker_core-static kickoffsearch_interfaces-shared
)
