diff --git a/CMakeLists.txt b/CMakeLists.txt index c49aab008..a4acaeb23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,12 +73,6 @@ set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compressed TYPE REQUIRED ) -find_package(dbusmenu-qt5 CONFIG) -set_package_properties(dbusmenu-qt5 PROPERTIES DESCRIPTION "Support for notification area menus via the DBusMenu protocol" - URL "https://launchpad.net/libdbusmenu-qt" - TYPE OPTIONAL - ) - find_package(X11) set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" URL "http://www.x.org" @@ -132,13 +126,11 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_subdirectory(doc) add_subdirectory(libkworkspace) +add_subdirectory(libdbusmenuqt) + add_subdirectory(libtaskmanager) add_subdirectory(components) -if(dbusmenu-qt5_FOUND) - add_subdirectory(appmenu) -endif() - add_subdirectory(plasma-windowed) add_subdirectory(shell) add_subdirectory(freespacenotifier) diff --git a/appmenu/CMakeLists.txt b/appmenu/CMakeLists.txt index 7addb5d1a..317f62e59 100644 --- a/appmenu/CMakeLists.txt +++ b/appmenu/CMakeLists.txt @@ -1,5 +1,3 @@ -include_directories(${dbusmenu-qt5_INCLUDE_DIRS}) - remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) set(kded_appmenu_SRCS @@ -24,7 +22,7 @@ target_link_libraries(appmenu KF5::KIOCore KF5::WindowSystem ${X11_LIBRARIES} - dbusmenu-qt5 + dbusmenuqt ) if (HAVE_X11) diff --git a/dataengines/statusnotifieritem/CMakeLists.txt b/dataengines/statusnotifieritem/CMakeLists.txt index 2e93583fd..6a6fc9aa4 100644 --- a/dataengines/statusnotifieritem/CMakeLists.txt +++ b/dataengines/statusnotifieritem/CMakeLists.txt @@ -1,5 +1,4 @@ include_directories(${plasma-workspace_SOURCE_DIR}/statusnotifierwatcher) -include_directories(${dbusmenu-qt5_INCLUDE_DIRS}) # We add our source code here set(statusnotifieritem_engine_SRCS @@ -8,11 +7,6 @@ set(statusnotifieritem_engine_SRCS statusnotifieritemservice.cpp statusnotifieritemjob.cpp systemtraytypes.cpp - - libdbusmenuqt/dbusmenuimporter.cpp - libdbusmenuqt/dbusmenushortcut_p.cpp - libdbusmenuqt/dbusmenutypes_p.cpp - libdbusmenuqt/utils.cpp ) set(statusnotifierwatcher_xml ${KNOTIFICATIONS_DBUS_INTERFACES_DIR}/kf5_org.kde.StatusNotifierWatcher.xml) @@ -34,6 +28,7 @@ target_link_libraries(plasma_engine_statusnotifieritem KF5::Service KF5::Plasma KF5::IconThemes + dbusmenuqt ) kcoreaddons_desktop_to_json(plasma_engine_statusnotifieritem plasma-dataengine-statusnotifieritem.desktop) diff --git a/libdbusmenuqt/CMakeLists.txt b/libdbusmenuqt/CMakeLists.txt new file mode 100644 index 000000000..9995811e8 --- /dev/null +++ b/libdbusmenuqt/CMakeLists.txt @@ -0,0 +1,13 @@ +set(libdbusmenu_SRCS +dbusmenuimporter.cpp +dbusmenushortcut_p.cpp +dbusmenutypes_p.cpp +utils.cpp +) + +add_library(dbusmenuqt STATIC ${libdbusmenu_SRCS}) +target_link_libraries(dbusmenuqt + Qt5::DBus + Qt5::Widgets +) + diff --git a/dataengines/statusnotifieritem/libdbusmenuqt/README b/libdbusmenuqt/README similarity index 100% rename from dataengines/statusnotifieritem/libdbusmenuqt/README rename to libdbusmenuqt/README diff --git a/dataengines/statusnotifieritem/libdbusmenuqt/dbusmenuimporter.cpp b/libdbusmenuqt/dbusmenuimporter.cpp similarity index 100% rename from dataengines/statusnotifieritem/libdbusmenuqt/dbusmenuimporter.cpp rename to libdbusmenuqt/dbusmenuimporter.cpp diff --git a/dataengines/statusnotifieritem/libdbusmenuqt/dbusmenuimporter.h b/libdbusmenuqt/dbusmenuimporter.h similarity index 100% rename from dataengines/statusnotifieritem/libdbusmenuqt/dbusmenuimporter.h rename to libdbusmenuqt/dbusmenuimporter.h diff --git a/dataengines/statusnotifieritem/libdbusmenuqt/dbusmenushortcut_p.cpp b/libdbusmenuqt/dbusmenushortcut_p.cpp similarity index 100% rename from dataengines/statusnotifieritem/libdbusmenuqt/dbusmenushortcut_p.cpp rename to libdbusmenuqt/dbusmenushortcut_p.cpp diff --git a/dataengines/statusnotifieritem/libdbusmenuqt/dbusmenushortcut_p.h b/libdbusmenuqt/dbusmenushortcut_p.h similarity index 100% rename from dataengines/statusnotifieritem/libdbusmenuqt/dbusmenushortcut_p.h rename to libdbusmenuqt/dbusmenushortcut_p.h diff --git a/dataengines/statusnotifieritem/libdbusmenuqt/dbusmenutypes_p.cpp b/libdbusmenuqt/dbusmenutypes_p.cpp similarity index 100% rename from dataengines/statusnotifieritem/libdbusmenuqt/dbusmenutypes_p.cpp rename to libdbusmenuqt/dbusmenutypes_p.cpp diff --git a/dataengines/statusnotifieritem/libdbusmenuqt/dbusmenutypes_p.h b/libdbusmenuqt/dbusmenutypes_p.h similarity index 100% rename from dataengines/statusnotifieritem/libdbusmenuqt/dbusmenutypes_p.h rename to libdbusmenuqt/dbusmenutypes_p.h diff --git a/dataengines/statusnotifieritem/libdbusmenuqt/utils.cpp b/libdbusmenuqt/utils.cpp similarity index 100% rename from dataengines/statusnotifieritem/libdbusmenuqt/utils.cpp rename to libdbusmenuqt/utils.cpp diff --git a/dataengines/statusnotifieritem/libdbusmenuqt/utils_p.h b/libdbusmenuqt/utils_p.h similarity index 100% rename from dataengines/statusnotifieritem/libdbusmenuqt/utils_p.h rename to libdbusmenuqt/utils_p.h