Git commit 450ef5884d9e93e6f0a2df48aae82f9ed239b394 by David Edmundson. Committed on 24/03/2018 at 07:31. Pushed by davidedmundson into branch 'master'.
Revert "use plasma_install_bundled_package" This reverts commit e37156b404bffd4dc6fd0d1b2dbb5dc1ae0ddfa4. Concept is fine, but currently we have severe CMake issues as well as a major containment loading bug. When re-reverting we need to be sure to test with clean install prefixes. CC: plasma-devel@kde.org M +6 -6 applets/CMakeLists.txt M +1 -1 applets/appmenu/CMakeLists.txt M +1 -1 applets/batterymonitor/CMakeLists.txt M +1 -1 applets/calendar/CMakeLists.txt M +1 -1 applets/devicenotifier/CMakeLists.txt M +1 -1 applets/digital-clock/CMakeLists.txt M +1 -1 applets/icon/CMakeLists.txt M +1 -1 applets/notifications/CMakeLists.txt M +1 -1 applets/systemtray/CMakeLists.txt M +1 -1 applets/systemtray/container/CMakeLists.txt https://commits.kde.org/plasma-workspace/450ef5884d9e93e6f0a2df48aae82f9ed239b394 diff --git a/applets/CMakeLists.txt b/applets/CMakeLists.txt index 34b3a399..956105e5 100644 --- a/applets/CMakeLists.txt +++ b/applets/CMakeLists.txt @@ -1,10 +1,10 @@ -plasma_install_bundled_package(activitybar org.kde.plasma.activitybar) +plasma_install_package(activitybar org.kde.plasma.activitybar) add_subdirectory(icon) -plasma_install_bundled_package(analog-clock org.kde.plasma.analogclock) -plasma_install_bundled_package(mediacontroller org.kde.plasma.mediacontroller) -plasma_install_bundled_package(panelspacer org.kde.plasma.panelspacer) -plasma_install_bundled_package(lock_logout org.kde.plasma.lock_logout) +plasma_install_package(analog-clock org.kde.plasma.analogclock) +plasma_install_package(mediacontroller org.kde.plasma.mediacontroller) +plasma_install_package(panelspacer org.kde.plasma.panelspacer) +plasma_install_package(lock_logout org.kde.plasma.lock_logout) add_subdirectory(appmenu) add_subdirectory(systemmonitor) @@ -12,7 +12,7 @@ add_subdirectory(batterymonitor) add_subdirectory(calendar) add_subdirectory(devicenotifier) add_subdirectory(digital-clock) -plasma_install_bundled_package(clipboard org.kde.plasma.clipboard) +plasma_install_package(clipboard org.kde.plasma.clipboard) if(NOT WIN32) # #notifications diff --git a/applets/appmenu/CMakeLists.txt b/applets/appmenu/CMakeLists.txt index c1786eb4..731013ba 100644 --- a/applets/appmenu/CMakeLists.txt +++ b/applets/appmenu/CMakeLists.txt @@ -1,4 +1,4 @@ add_subdirectory(lib) add_subdirectory(plugin) -plasma_install_bundled_package(package org.kde.plasma.appmenu) +plasma_install_package(package org.kde.plasma.appmenu) diff --git a/applets/batterymonitor/CMakeLists.txt b/applets/batterymonitor/CMakeLists.txt index 78ff53b9..fb7aea96 100644 --- a/applets/batterymonitor/CMakeLists.txt +++ b/applets/batterymonitor/CMakeLists.txt @@ -1 +1 @@ -plasma_install_bundled_package(package org.kde.plasma.battery) +plasma_install_package(package org.kde.plasma.battery) diff --git a/applets/calendar/CMakeLists.txt b/applets/calendar/CMakeLists.txt index 7c08c68b..869aa715 100644 --- a/applets/calendar/CMakeLists.txt +++ b/applets/calendar/CMakeLists.txt @@ -11,4 +11,4 @@ target_link_libraries(plasma_applet_calendar install(TARGETS plasma_applet_calendar DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/applets) -plasma_install_bundled_package(package org.kde.plasma.calendar) +plasma_install_package(package org.kde.plasma.calendar) diff --git a/applets/devicenotifier/CMakeLists.txt b/applets/devicenotifier/CMakeLists.txt index abb8952a..23d70e2e 100644 --- a/applets/devicenotifier/CMakeLists.txt +++ b/applets/devicenotifier/CMakeLists.txt @@ -1,3 +1,3 @@ -plasma_install_bundled_package(package org.kde.plasma.devicenotifier) +plasma_install_package(package org.kde.plasma.devicenotifier) install(FILES test-predicate-openinwindow.desktop DESTINATION ${KDE_INSTALL_DATADIR}/solid/actions ) diff --git a/applets/digital-clock/CMakeLists.txt b/applets/digital-clock/CMakeLists.txt index 87849742..3114564a 100644 --- a/applets/digital-clock/CMakeLists.txt +++ b/applets/digital-clock/CMakeLists.txt @@ -1,3 +1,3 @@ add_subdirectory(plugin) -plasma_install_bundled_package(package org.kde.plasma.digitalclock) \ No newline at end of file +plasma_install_package(package org.kde.plasma.digitalclock) \ No newline at end of file diff --git a/applets/icon/CMakeLists.txt b/applets/icon/CMakeLists.txt index c4793dc6..e4ffda67 100644 --- a/applets/icon/CMakeLists.txt +++ b/applets/icon/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(plasma_applet_icon install(TARGETS plasma_applet_icon DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/applets) -plasma_install_bundled_package(package org.kde.plasma.icon) +plasma_install_package(package org.kde.plasma.icon) diff --git a/applets/notifications/CMakeLists.txt b/applets/notifications/CMakeLists.txt index 7c60237c..adfd6013 100644 --- a/applets/notifications/CMakeLists.txt +++ b/applets/notifications/CMakeLists.txt @@ -1,4 +1,4 @@ add_subdirectory(lib) add_subdirectory(plugin) -plasma_install_bundled_package(package org.kde.plasma.notifications) +plasma_install_package(package org.kde.plasma.notifications) diff --git a/applets/systemtray/CMakeLists.txt b/applets/systemtray/CMakeLists.txt index 48d6a6fc..4b5540b7 100644 --- a/applets/systemtray/CMakeLists.txt +++ b/applets/systemtray/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.private.systemtray\") -plasma_install_bundled_package(package org.kde.plasma.private.systemtray) +plasma_install_package(package org.kde.plasma.private.systemtray) set(systemtray_SRCS systemtray.cpp diff --git a/applets/systemtray/container/CMakeLists.txt b/applets/systemtray/container/CMakeLists.txt index 8d30a765..d775ef75 100644 --- a/applets/systemtray/container/CMakeLists.txt +++ b/applets/systemtray/container/CMakeLists.txt @@ -1,5 +1,5 @@ -plasma_install_bundled_package(package org.kde.plasma.systemtray) +plasma_install_package(package org.kde.plasma.systemtray) set(systemtraycontainer_SRCS systemtraycontainer.cpp