Revert "Port dataengines to PLASMA_DATA_INSTALL_DIR"

This reverts commit 73736e80ea.

DataEngines are actual plugins to plasma-framework, so the change
is not correct. Otherwise they end up in /share
wilder-5.14
Aleix Pol 12 years ago
parent 73736e80ea
commit bb43827e62
  1. 2
      dataengines/activities/CMakeLists.txt
  2. 2
      dataengines/akonadi/CMakeLists.txt
  3. 2
      dataengines/applicationjobs/CMakeLists.txt
  4. 2
      dataengines/apps/CMakeLists.txt
  5. 2
      dataengines/calendar/CMakeLists.txt
  6. 2
      dataengines/devicenotifications/CMakeLists.txt
  7. 2
      dataengines/dict/CMakeLists.txt
  8. 2
      dataengines/executable/CMakeLists.txt
  9. 2
      dataengines/favicons/CMakeLists.txt
  10. 2
      dataengines/filebrowser/CMakeLists.txt
  11. 6
      dataengines/geolocation/CMakeLists.txt
  12. 2
      dataengines/hotplug/CMakeLists.txt
  13. 2
      dataengines/keystate/CMakeLists.txt
  14. 2
      dataengines/mouse/CMakeLists.txt
  15. 2
      dataengines/mpris2/CMakeLists.txt
  16. 2
      dataengines/network/CMakeLists.txt
  17. 2
      dataengines/notifications/CMakeLists.txt
  18. 2
      dataengines/packagekit/CMakeLists.txt
  19. 2
      dataengines/places/CMakeLists.txt
  20. 2
      dataengines/powermanagement/CMakeLists.txt
  21. 2
      dataengines/rss/CMakeLists.txt
  22. 4
      dataengines/share/CMakeLists.txt
  23. 2
      dataengines/soliddevice/CMakeLists.txt
  24. 2
      dataengines/statusnotifieritem/CMakeLists.txt
  25. 2
      dataengines/systemmonitor/CMakeLists.txt
  26. 2
      dataengines/tasks/CMakeLists.txt
  27. 2
      dataengines/time/CMakeLists.txt
  28. 2
      dataengines/weather/CMakeLists.txt
  29. 2
      dataengines/weather/ions/bbcukmet/CMakeLists.txt
  30. 2
      dataengines/weather/ions/debianweather/CMakeLists.txt
  31. 2
      dataengines/weather/ions/envcan/CMakeLists.txt
  32. 2
      dataengines/weather/ions/noaa/CMakeLists.txt
  33. 2
      dataengines/weather/ions/wetter.com/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})

@ -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})

@ -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)

@ -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)

@ -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})

@ -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} )

@ -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})

@ -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} )

@ -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} )

@ -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} )

@ -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()
# -------------------------------------------------------------------------------------------------

@ -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 )

@ -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)

@ -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} )

@ -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)

@ -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} )

@ -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)

@ -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} )

@ -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

@ -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)

@ -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} )

@ -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})

@ -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 )

@ -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)

@ -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} )

@ -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)

@ -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} )

@ -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})

@ -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)

@ -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})

@ -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)

@ -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)

@ -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)

Loading…
Cancel
Save