Revert "use plasma_install_bundled_package"

This reverts commit e37156b. 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
KDE · Mar 24, 2018 · 450ef58 · 450ef58
1 parent 6e55d16
commit 450ef58
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/applets/CMakeLists.txt b/applets/CMakeLists.txt
@@ -1,18 +1,18 @@
-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)
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,3 @@
 add_subdirectory(plugin)
 
-plasma_install_bundled_package(package org.kde.plasma.digitalclock)
+plasma_install_package(package org.kde.plasma.digitalclock)
diff --git 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
@@ -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
@@ -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
@@ -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