diff --git a/dataengines/activities/CMakeLists.txt b/dataengines/activities/CMakeLists.txt index 5df09aa77..c1159e1d0 100644 --- a/dataengines/activities/CMakeLists.txt +++ b/dataengines/activities/CMakeLists.txt @@ -24,7 +24,7 @@ target_link_libraries(plasma_engine_activities kservice_desktop_to_json(plasma_engine_activities plasma-engine-activities.desktop) install(TARGETS plasma_engine_activities - DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) + DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-engine-activities.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/dataengines/akonadi/CMakeLists.txt b/dataengines/akonadi/CMakeLists.txt index 2ec652391..ccf5dcaf8 100644 --- a/dataengines/akonadi/CMakeLists.txt +++ b/dataengines/akonadi/CMakeLists.txt @@ -24,6 +24,6 @@ target_link_libraries( microblog ) -install(TARGETS plasma_engine_akonadi DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_akonadi DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-engine-akonadi.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/dataengines/applicationjobs/CMakeLists.txt b/dataengines/applicationjobs/CMakeLists.txt index 6503d7a08..d00cd9ca3 100644 --- a/dataengines/applicationjobs/CMakeLists.txt +++ b/dataengines/applicationjobs/CMakeLists.txt @@ -24,7 +24,7 @@ target_link_libraries(plasma_engine_applicationjobs kservice_desktop_to_json(plasma_engine_applicationjobs plasma-dataengine-applicationjobs.desktop) -install(TARGETS plasma_engine_applicationjobs DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_applicationjobs DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-applicationjobs.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install(FILES applicationjobs.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services) diff --git a/dataengines/apps/CMakeLists.txt b/dataengines/apps/CMakeLists.txt index 41fa6cc0c..ca6a7d22a 100644 --- a/dataengines/apps/CMakeLists.txt +++ b/dataengines/apps/CMakeLists.txt @@ -16,6 +16,6 @@ target_link_libraries(plasma_engine_apps kservice_desktop_to_json(plasma_engine_apps plasma-dataengine-apps.desktop) -install(TARGETS plasma_engine_apps DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_apps DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-apps.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES apps.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services) diff --git a/dataengines/calendar/CMakeLists.txt b/dataengines/calendar/CMakeLists.txt index c233508d5..59f09d2f5 100644 --- a/dataengines/calendar/CMakeLists.txt +++ b/dataengines/calendar/CMakeLists.txt @@ -39,6 +39,6 @@ if(Akonadi_FOUND) ) endif() -install(TARGETS plasma_engine_calendar DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_calendar DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-calendar.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/dataengines/devicenotifications/CMakeLists.txt b/dataengines/devicenotifications/CMakeLists.txt index 02d5e3b13..265d6c59d 100644 --- a/dataengines/devicenotifications/CMakeLists.txt +++ b/dataengines/devicenotifications/CMakeLists.txt @@ -15,5 +15,5 @@ target_link_libraries(plasma_engine_devicenotifications kservice_desktop_to_json(plasma_engine_devicenotifications plasma-dataengine-devicenotifications.desktop) -install(TARGETS plasma_engine_devicenotifications DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_devicenotifications DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-devicenotifications.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/dataengines/dict/CMakeLists.txt b/dataengines/dict/CMakeLists.txt index 8da4563b7..c04198632 100644 --- a/dataengines/dict/CMakeLists.txt +++ b/dataengines/dict/CMakeLists.txt @@ -14,5 +14,5 @@ target_link_libraries (plasma_engine_dict kservice_desktop_to_json(plasma_engine_dict plasma-dataengine-dict.desktop) -install(TARGETS plasma_engine_dict DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_dict DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-dict.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/dataengines/executable/CMakeLists.txt b/dataengines/executable/CMakeLists.txt index 23df0aeac..3c21b0931 100644 --- a/dataengines/executable/CMakeLists.txt +++ b/dataengines/executable/CMakeLists.txt @@ -12,5 +12,5 @@ target_link_libraries(plasma_engine_executable kservice_desktop_to_json(plasma_engine_executable plasma-dataengine-executable.desktop) -install(TARGETS plasma_engine_executable DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_executable DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-executable.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/dataengines/favicons/CMakeLists.txt b/dataengines/favicons/CMakeLists.txt index 9719b5a01..e1fa3aeb2 100644 --- a/dataengines/favicons/CMakeLists.txt +++ b/dataengines/favicons/CMakeLists.txt @@ -11,7 +11,7 @@ target_link_libraries(plasma_engine_favicons kservice_desktop_to_json(plasma_engine_favicons plasma-dataengine-favicons.desktop) -install(TARGETS plasma_engine_favicons DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine ) +install(TARGETS plasma_engine_favicons DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine ) install(FILES plasma-dataengine-favicons.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/dataengines/filebrowser/CMakeLists.txt b/dataengines/filebrowser/CMakeLists.txt index f0e379411..7f49279c0 100644 --- a/dataengines/filebrowser/CMakeLists.txt +++ b/dataengines/filebrowser/CMakeLists.txt @@ -12,6 +12,6 @@ target_link_libraries(plasma_engine_filebrowser kservice_desktop_to_json(plasma_engine_filebrowser plasma-dataengine-filebrowser.desktop) -install(TARGETS plasma_engine_filebrowser DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_filebrowser DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-filebrowser.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/dataengines/geolocation/CMakeLists.txt b/dataengines/geolocation/CMakeLists.txt index fa4768f57..59f483044 100644 --- a/dataengines/geolocation/CMakeLists.txt +++ b/dataengines/geolocation/CMakeLists.txt @@ -39,7 +39,7 @@ target_link_libraries(plasma_engine_geolocation KF5::Solid) kservice_desktop_to_json(plasma_engine_geolocation plasma-dataengine-geolocation.desktop) -install(TARGETS plasma_engine_geolocation DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_geolocation DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-geolocation.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES plasma-geolocationprovider.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) @@ -49,7 +49,7 @@ set(plasma_geolocation_ip_SRCS location_ip.cpp) add_library(plasma-geolocation-ip MODULE ${plasma_geolocation_ip_SRCS}) target_link_libraries(plasma-geolocation-ip plasma-geolocation-interface KF5::KIOCore) install(FILES plasma-geolocation-ip.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(TARGETS plasma-geolocation-ip DESTINATION ${PLASMA_DATA_INSTALL_DIR}/geolocationprovider) +install(TARGETS plasma-geolocation-ip DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/geolocationprovider) # ------------------------------------------------------------------------------------------------- @@ -65,7 +65,7 @@ if(LIBGPS_FOUND) add_library(plasma-geolocation-gps MODULE ${plasma_geolocation_gps_SRCS}) target_link_libraries(plasma-geolocation-gps plasma-geolocation-interface ${LIBGPS_LIBRARIES}) install(FILES plasma-geolocation-gps.desktop DESTINATION ${SERVICES_INSTALL_DIR}) - install(TARGETS plasma-geolocation-gps DESTINATION ${PLASMA_DATA_INSTALL_DIR}/geolocationprovider) + install(TARGETS plasma-geolocation-gps DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/geolocationprovider) endif() # ------------------------------------------------------------------------------------------------- diff --git a/dataengines/hotplug/CMakeLists.txt b/dataengines/hotplug/CMakeLists.txt index 70cee187f..0d3b65798 100644 --- a/dataengines/hotplug/CMakeLists.txt +++ b/dataengines/hotplug/CMakeLists.txt @@ -17,6 +17,6 @@ target_link_libraries(plasma_engine_hotplug kservice_desktop_to_json(plasma_engine_hotplug plasma-dataengine-hotplug.desktop) -install(TARGETS plasma_engine_hotplug DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_hotplug DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-hotplug.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install(FILES hotplug.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services ) diff --git a/dataengines/keystate/CMakeLists.txt b/dataengines/keystate/CMakeLists.txt index 3e1132d7e..0640e2e85 100644 --- a/dataengines/keystate/CMakeLists.txt +++ b/dataengines/keystate/CMakeLists.txt @@ -15,7 +15,7 @@ target_link_libraries(plasma_engine_keystate kservice_desktop_to_json(plasma_engine_keystate plasma-dataengine-keystate.desktop) -install(TARGETS plasma_engine_keystate DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_keystate DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-keystate.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install(FILES modifierkeystate.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services) diff --git a/dataengines/mouse/CMakeLists.txt b/dataengines/mouse/CMakeLists.txt index a695f05f3..29cab878b 100644 --- a/dataengines/mouse/CMakeLists.txt +++ b/dataengines/mouse/CMakeLists.txt @@ -14,6 +14,6 @@ if (X11_Xfixes_FOUND) target_link_libraries(plasma_engine_mouse ${X11_Xfixes_LIB}) endif () -install(TARGETS plasma_engine_mouse DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_mouse DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-mouse.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/dataengines/mpris2/CMakeLists.txt b/dataengines/mpris2/CMakeLists.txt index 1f485db90..68d218627 100644 --- a/dataengines/mpris2/CMakeLists.txt +++ b/dataengines/mpris2/CMakeLists.txt @@ -32,7 +32,7 @@ target_link_libraries(plasma_engine_mpris2 kservice_desktop_to_json(plasma_engine_mpris2 plasma-dataengine-mpris2.desktop) -install(TARGETS plasma_engine_mpris2 DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_mpris2 DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-mpris2.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES mpris2.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services) diff --git a/dataengines/network/CMakeLists.txt b/dataengines/network/CMakeLists.txt index 0c66c9281..b9665d786 100644 --- a/dataengines/network/CMakeLists.txt +++ b/dataengines/network/CMakeLists.txt @@ -5,6 +5,6 @@ set(network_engine_SRCS add_library(plasma_engine_network MODULE ${network_engine_SRCS}) target_link_libraries(plasma_engine_network KF5::CoreAddons KF5::Plasma solidcontrol) -install(TARGETS plasma_engine_network DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_network DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-network.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/dataengines/notifications/CMakeLists.txt b/dataengines/notifications/CMakeLists.txt index b4cde1d31..59f98124a 100644 --- a/dataengines/notifications/CMakeLists.txt +++ b/dataengines/notifications/CMakeLists.txt @@ -21,6 +21,6 @@ target_link_libraries(plasma_engine_notifications kservice_desktop_to_json(plasma_engine_notifications plasma-dataengine-notifications.desktop) -install(TARGETS plasma_engine_notifications DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_notifications DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-notifications.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install(FILES notifications.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services) diff --git a/dataengines/packagekit/CMakeLists.txt b/dataengines/packagekit/CMakeLists.txt index 7d0dca98a..d2ac39f55 100644 --- a/dataengines/packagekit/CMakeLists.txt +++ b/dataengines/packagekit/CMakeLists.txt @@ -13,7 +13,7 @@ kservice_desktop_to_json(plasma_engine_packagekit plasma-dataengine-packagekit.d target_link_libraries(plasma_engine_packagekit KF5::Plasma KF5::CoreAddons Qt5::DBus ) install(TARGETS plasma_engine_packagekit - DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) + DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-packagekit.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/dataengines/places/CMakeLists.txt b/dataengines/places/CMakeLists.txt index d1886dade..8fcd2bf77 100644 --- a/dataengines/places/CMakeLists.txt +++ b/dataengines/places/CMakeLists.txt @@ -20,7 +20,7 @@ target_link_libraries(plasma_engine_places kservice_desktop_to_json(plasma_engine_places plasma-dataengine-places.desktop) install(TARGETS plasma_engine_places - DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) + DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-places.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install(FILES org.kde.places.operations diff --git a/dataengines/powermanagement/CMakeLists.txt b/dataengines/powermanagement/CMakeLists.txt index 2b2f011df..235677b14 100644 --- a/dataengines/powermanagement/CMakeLists.txt +++ b/dataengines/powermanagement/CMakeLists.txt @@ -23,7 +23,7 @@ target_link_libraries(plasma_engine_powermanagement kservice_desktop_to_json(plasma_engine_powermanagement plasma-dataengine-powermanagement.desktop) -install(TARGETS plasma_engine_powermanagement DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_powermanagement DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-powermanagement.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install(FILES powermanagementservice.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services) diff --git a/dataengines/rss/CMakeLists.txt b/dataengines/rss/CMakeLists.txt index 5127c9c7d..604391cff 100644 --- a/dataengines/rss/CMakeLists.txt +++ b/dataengines/rss/CMakeLists.txt @@ -8,6 +8,6 @@ set(rss_engine_SRCS add_library(plasma_engine_rss MODULE ${rss_engine_SRCS}) target_link_libraries(plasma_engine_rss KF5::Plasma KF5::CoreAddons ${KDE4_SYNDICATION_LIBS} KF5::Solid) -install(TARGETS plasma_engine_rss DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_rss DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-rss.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/dataengines/share/CMakeLists.txt b/dataengines/share/CMakeLists.txt index 4afeaa724..f7737bf74 100644 --- a/dataengines/share/CMakeLists.txt +++ b/dataengines/share/CMakeLists.txt @@ -16,7 +16,7 @@ target_link_libraries(plasma_engine_share kservice_desktop_to_json(plasma_engine_share plasma-dataengine-share.desktop) install(TARGETS plasma_engine_share - DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) + DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-share.desktop DESTINATION ${SERVICES_INSTALL_DIR}) @@ -41,6 +41,6 @@ target_link_libraries(plasma_packagestructure_share KF5::Service) install(TARGETS plasma_packagestructure_share - DESTINATION ${PLASMA_DATA_INSTALL_DIR}/packagestructure) + DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/packagestructure) install(FILES data/plasma-packagestructure-share.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/dataengines/soliddevice/CMakeLists.txt b/dataengines/soliddevice/CMakeLists.txt index 57362df63..bb8245c5e 100644 --- a/dataengines/soliddevice/CMakeLists.txt +++ b/dataengines/soliddevice/CMakeLists.txt @@ -20,7 +20,7 @@ target_link_libraries(plasma_engine_soliddevice kservice_desktop_to_json(plasma_engine_soliddevice plasma-dataengine-soliddevice.desktop) -install(TARGETS plasma_engine_soliddevice DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_soliddevice DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-soliddevice.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install(FILES soliddevice.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services ) diff --git a/dataengines/statusnotifieritem/CMakeLists.txt b/dataengines/statusnotifieritem/CMakeLists.txt index 3ff51c4aa..d5f0a3466 100644 --- a/dataengines/statusnotifieritem/CMakeLists.txt +++ b/dataengines/statusnotifieritem/CMakeLists.txt @@ -37,7 +37,7 @@ target_link_libraries(plasma_engine_statusnotifieritem kservice_desktop_to_json(plasma_engine_statusnotifieritem plasma-engine-statusnotifieritem.desktop) -install(TARGETS plasma_engine_statusnotifieritem DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_statusnotifieritem DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-engine-statusnotifieritem.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES statusnotifieritem.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services) diff --git a/dataengines/systemmonitor/CMakeLists.txt b/dataengines/systemmonitor/CMakeLists.txt index 30972ebe7..0bdf93760 100644 --- a/dataengines/systemmonitor/CMakeLists.txt +++ b/dataengines/systemmonitor/CMakeLists.txt @@ -15,5 +15,5 @@ target_link_libraries(plasma_engine_systemmonitor kservice_desktop_to_json(plasma_engine_systemmonitor plasma-dataengine-systemmonitor.desktop) -install(TARGETS plasma_engine_systemmonitor DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_systemmonitor DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-systemmonitor.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/dataengines/tasks/CMakeLists.txt b/dataengines/tasks/CMakeLists.txt index 5ef1b0d84..67260c96f 100644 --- a/dataengines/tasks/CMakeLists.txt +++ b/dataengines/tasks/CMakeLists.txt @@ -17,7 +17,7 @@ target_link_libraries(plasma_engine_tasks taskmanager) kservice_desktop_to_json(plasma_engine_tasks plasma-dataengine-tasks.desktop) -install(TARGETS plasma_engine_tasks DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_tasks DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-tasks.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES tasks.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services) install(FILES windowtasks.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services) diff --git a/dataengines/time/CMakeLists.txt b/dataengines/time/CMakeLists.txt index 75cac1ecf..e3269ab1c 100644 --- a/dataengines/time/CMakeLists.txt +++ b/dataengines/time/CMakeLists.txt @@ -18,5 +18,5 @@ target_link_libraries(plasma_engine_time kservice_desktop_to_json(plasma_engine_time plasma-dataengine-time.desktop) -install(TARGETS plasma_engine_time DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS plasma_engine_time DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES plasma-dataengine-time.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/dataengines/weather/CMakeLists.txt b/dataengines/weather/CMakeLists.txt index 19a47d1bb..cc552797f 100644 --- a/dataengines/weather/CMakeLists.txt +++ b/dataengines/weather/CMakeLists.txt @@ -3,5 +3,5 @@ add_subdirectory(ions) #set(weather_SRCS weatherengine.cpp) #add_library(plasma_engine_weather MODULE ${weather_SRCS}) #target_link_libraries (plasma_engine_weather KF5::KIOCore KF5::Solid KF5::Plasma KF5::KDELibs4Support weather_ion) -#install (TARGETS plasma_engine_weather DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +#install (TARGETS plasma_engine_weather DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) #install (FILES plasma-dataengine-weather.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/dataengines/weather/ions/bbcukmet/CMakeLists.txt b/dataengines/weather/ions/bbcukmet/CMakeLists.txt index 2b0d8ce3d..20f6ffadc 100644 --- a/dataengines/weather/ions/bbcukmet/CMakeLists.txt +++ b/dataengines/weather/ions/bbcukmet/CMakeLists.txt @@ -4,5 +4,5 @@ target_link_libraries (ion_bbcukmet KF5::Solid weather_ion) install (FILES ion-bbcukmet.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install (TARGETS ion_bbcukmet DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install (TARGETS ion_bbcukmet DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) diff --git a/dataengines/weather/ions/debianweather/CMakeLists.txt b/dataengines/weather/ions/debianweather/CMakeLists.txt index b7bdf5a2a..b85f8fb5f 100644 --- a/dataengines/weather/ions/debianweather/CMakeLists.txt +++ b/dataengines/weather/ions/debianweather/CMakeLists.txt @@ -10,7 +10,7 @@ target_link_libraries(ion_debianweather weather_ion Qt5::Core) install(TARGETS ion_debianweather - DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) + DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) install(FILES ion-debianweather.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/dataengines/weather/ions/envcan/CMakeLists.txt b/dataengines/weather/ions/envcan/CMakeLists.txt index f0053225d..86f36359e 100644 --- a/dataengines/weather/ions/envcan/CMakeLists.txt +++ b/dataengines/weather/ions/envcan/CMakeLists.txt @@ -4,5 +4,5 @@ target_link_libraries (ion_envcan KF5::Solid weather_ion) install (FILES ion-envcan.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install (TARGETS ion_envcan DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install (TARGETS ion_envcan DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) diff --git a/dataengines/weather/ions/noaa/CMakeLists.txt b/dataengines/weather/ions/noaa/CMakeLists.txt index b90b2f83b..544f5370e 100644 --- a/dataengines/weather/ions/noaa/CMakeLists.txt +++ b/dataengines/weather/ions/noaa/CMakeLists.txt @@ -5,5 +5,5 @@ target_link_libraries (ion_noaa KF5::Solid KF5::KDELibs4Support KF5::I18n weathe kservice_desktop_to_json(ion_noaa ion-noaa.desktop) install (FILES ion-noaa.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install (TARGETS ion_noaa DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install (TARGETS ion_noaa DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine) diff --git a/dataengines/weather/ions/wetter.com/CMakeLists.txt b/dataengines/weather/ions/wetter.com/CMakeLists.txt index 7c2293a84..48e5f6671 100644 --- a/dataengines/weather/ions/wetter.com/CMakeLists.txt +++ b/dataengines/weather/ions/wetter.com/CMakeLists.txt @@ -3,5 +3,5 @@ add_library(ion_wettercom MODULE ${ion_wettercom_SRCS}) target_link_libraries(ion_wettercom weather_ion KF5::CoreAddons KF5::Plasma KIOCore ${KDE4_KUNITCONVERSION_LIBS}) install(FILES ion-wettercom.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(TARGETS ion_wettercom DESTINATION ${PLASMA_DATA_INSTALL_DIR}/dataengine) +install(TARGETS ion_wettercom DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine)