diff --git a/applets/CMakeLists.txt b/applets/CMakeLists.txt index ddc74f626..200133b6e 100644 --- a/applets/CMakeLists.txt +++ b/applets/CMakeLists.txt @@ -1,14 +1,14 @@ add_subdirectory(kicker) add_subdirectory(kickoff) add_subdirectory(trash) add_subdirectory(taskmanager) -plasma_install_package(window-list org.kde.plasma.windowlist) -plasma_install_package(icontasks org.kde.plasma.icontasks) +plasma_install_bundled_package(window-list org.kde.plasma.windowlist) +plasma_install_bundled_package(icontasks org.kde.plasma.icontasks) if(KF5Activities_FOUND) add_subdirectory(pager) add_subdirectory(showActivityManager) endif() add_subdirectory(kimpanel) diff --git a/applets/kicker/CMakeLists.txt b/applets/kicker/CMakeLists.txt index 9551dcf2d..0a3ca39e0 100644 --- a/applets/kicker/CMakeLists.txt +++ b/applets/kicker/CMakeLists.txt @@ -1,89 +1,89 @@ add_definitions( -DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_TO_ASCII # -DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_USE_FAST_OPERATOR_PLUS -DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.kicker\" ) -plasma_install_package(package org.kde.plasma.kicker) +plasma_install_bundled_package(package org.kde.plasma.kicker) set(kickerplugin_SRCS plugin/abstractentry.cpp plugin/abstractmodel.cpp plugin/actionlist.cpp plugin/appentry.cpp plugin/appsmodel.cpp plugin/computermodel.cpp plugin/contactentry.cpp plugin/containmentinterface.cpp plugin/draghelper.cpp plugin/simplefavoritesmodel.cpp plugin/kastatsfavoritesmodel.cpp plugin/fileentry.cpp plugin/forwardingmodel.cpp plugin/placeholdermodel.cpp plugin/funnelmodel.cpp plugin/dashboardwindow.cpp plugin/kickerplugin.cpp plugin/menuentryeditor.cpp plugin/processrunner.cpp plugin/rootmodel.cpp plugin/runnermodel.cpp plugin/runnermatchesmodel.cpp plugin/recentcontactsmodel.cpp plugin/recentusagemodel.cpp plugin/submenu.cpp plugin/systementry.cpp plugin/systemmodel.cpp plugin/systemsettings.cpp plugin/wheelinterceptor.cpp plugin/windowsystem.cpp plugin/funnelmodel.cpp ) ecm_qt_declare_logging_category(kickerplugin_SRCS HEADER debug.h IDENTIFIER KICKER_DEBUG CATEGORY_NAME org.kde.plasma.kicker) qt5_add_dbus_interface(kickerplugin_SRCS ${KRUNNERAPP_INTERFACE} krunner_interface) qt5_add_dbus_interface(kickerplugin_SRCS ${KSMSERVER_DBUS_INTERFACE} ksmserver_interface) install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/kicker) add_library(kickerplugin SHARED ${kickerplugin_SRCS}) target_link_libraries(kickerplugin Qt5::Core Qt5::DBus Qt5::Qml Qt5::Quick Qt5::X11Extras KF5::Activities KF5::ActivitiesStats KF5::ConfigCore KF5::CoreAddons KF5::I18n KF5::ItemModels KF5::KDELibs4Support # FIXME: New Solid power management API doesn't exist yet, so we need to use deprecated stuff. KF5::KIOCore KF5::KIOWidgets KF5::People KF5::PeopleWidgets KF5::PlasmaQuick KF5::Runner KF5::Service KF5::Solid KF5::WindowSystem PW::KWorkspace) if (${HAVE_APPSTREAMQT}) target_link_libraries(kickerplugin AppStreamQt) endif() install(TARGETS kickerplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/kicker) diff --git a/applets/kickoff/CMakeLists.txt b/applets/kickoff/CMakeLists.txt index 2f98ff707..cb8fd185d 100644 --- a/applets/kickoff/CMakeLists.txt +++ b/applets/kickoff/CMakeLists.txt @@ -1,5 +1,5 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.kickoff\") ####################################################################################### # Package -plasma_install_package(package org.kde.plasma.kickoff) +plasma_install_bundled_package(package org.kde.plasma.kickoff) diff --git a/applets/kimpanel/CMakeLists.txt b/applets/kimpanel/CMakeLists.txt index 2736f7143..d78d441e0 100644 --- a/applets/kimpanel/CMakeLists.txt +++ b/applets/kimpanel/CMakeLists.txt @@ -1,16 +1,16 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) add_subdirectory(backend) -plasma_install_package(package org.kde.plasma.kimpanel) +plasma_install_bundled_package(package org.kde.plasma.kimpanel) set(kimpanelplugin_SRCS plugin/screen.cpp plugin/kimpanelplugin.cpp ) install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/kimpanel) add_library(kimpanelplugin SHARED ${kimpanelplugin_SRCS}) target_link_libraries(kimpanelplugin Qt5::Gui Qt5::Qml) install(TARGETS kimpanelplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/kimpanel) diff --git a/applets/pager/CMakeLists.txt b/applets/pager/CMakeLists.txt index 1f257d679..b2a311289 100644 --- a/applets/pager/CMakeLists.txt +++ b/applets/pager/CMakeLists.txt @@ -1,29 +1,29 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.pager\") -plasma_install_package(package org.kde.plasma.pager) +plasma_install_bundled_package(package org.kde.plasma.pager) set(pager_SRCS plugin/pagermodel.cpp plugin/pagerplugin.cpp plugin/windowmodel.cpp) add_library(pagerplugin SHARED ${pager_SRCS}) target_link_libraries(pagerplugin KF5::KIOCore KF5::WindowSystem KF5::Plasma KF5::Activities KF5::KDELibs4Support PW::LibTaskManager Qt5::Core Qt5::DBus Qt5::Qml Qt5::Quick Qt5::DBus) if (X11_FOUND) target_link_libraries(pagerplugin Qt5::X11Extras) endif() install(TARGETS pagerplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/pager) install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/pager) diff --git a/applets/showActivityManager/CMakeLists.txt b/applets/showActivityManager/CMakeLists.txt index 71ae11bc7..4da3f71c8 100644 --- a/applets/showActivityManager/CMakeLists.txt +++ b/applets/showActivityManager/CMakeLists.txt @@ -1 +1 @@ -plasma_install_package(package org.kde.plasma.showActivityManager) +plasma_install_bundled_package(package org.kde.plasma.showActivityManager) diff --git a/applets/taskmanager/CMakeLists.txt b/applets/taskmanager/CMakeLists.txt index 63f779fd1..73f696b69 100644 --- a/applets/taskmanager/CMakeLists.txt +++ b/applets/taskmanager/CMakeLists.txt @@ -1,34 +1,34 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.taskmanager\") -plasma_install_package(package org.kde.plasma.taskmanager) +plasma_install_bundled_package(package org.kde.plasma.taskmanager) set(taskmanagerplugin_SRCS plugin/backend.cpp plugin/draghelper.cpp plugin/taskmanagerplugin.cpp plugin/smartlaunchers/smartlauncherbackend.cpp plugin/smartlaunchers/smartlauncheritem.cpp ) install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/taskmanager) add_library(taskmanagerplugin SHARED ${taskmanagerplugin_SRCS}) # FIXME Cleanup no longer used libs. target_link_libraries(taskmanagerplugin Qt5::Core Qt5::DBus Qt5::Qml Qt5::Quick KF5::Activities KF5::ActivitiesStats KF5::I18n KF5::KIOCore KF5::KIOWidgets KF5::KIOFileWidgets # KFilePlacesModel KF5::Plasma KF5::Service KF5::WindowSystem) install(TARGETS taskmanagerplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/taskmanager) diff --git a/applets/trash/CMakeLists.txt b/applets/trash/CMakeLists.txt index e20859b52..197f72c58 100644 --- a/applets/trash/CMakeLists.txt +++ b/applets/trash/CMakeLists.txt @@ -1,4 +1,4 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.trash\") add_subdirectory(plugin) -plasma_install_package(package org.kde.plasma.trash) +plasma_install_bundled_package(package org.kde.plasma.trash) diff --git a/containments/CMakeLists.txt b/containments/CMakeLists.txt index 966c3fd95..201974bab 100644 --- a/containments/CMakeLists.txt +++ b/containments/CMakeLists.txt @@ -1,3 +1,3 @@ add_subdirectory(desktop) -plasma_install_package(folder org.kde.plasma.folder plasmoids containment) -plasma_install_package(panel org.kde.panel plasmoids containment) +plasma_install_bundled_package(folder org.kde.plasma.folder plasmoids containment) +plasma_install_bundled_package(panel org.kde.panel plasmoids containment) diff --git a/containments/desktop/CMakeLists.txt b/containments/desktop/CMakeLists.txt index fb8709a94..974028a10 100644 --- a/containments/desktop/CMakeLists.txt +++ b/containments/desktop/CMakeLists.txt @@ -1,3 +1,3 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.desktopcontainment\") add_subdirectory(plugins) -plasma_install_package(package org.kde.desktopcontainment plasmoids containment) +plasma_install_bundled_package(package org.kde.desktopcontainment plasmoids containment)