Commit 11d395cc authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Use non-deprecated KDEInstallDirs variables

parent cfbe5c43
......@@ -7,8 +7,8 @@ set(colorpickerplugin_SRCS
plugin/colorpickerplugin.cpp
)
install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/colorpicker)
install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/colorpicker)
add_library(colorpickerplugin SHARED ${colorpickerplugin_SRCS})
target_link_libraries(colorpickerplugin Qt5::DBus Qt5::Gui Qt5::Qml Qt5::Widgets KF5::WindowSystem)
install(TARGETS colorpickerplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/colorpicker)
install(TARGETS colorpickerplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/colorpicker)
......@@ -36,9 +36,9 @@ target_link_libraries(plasma_applet_comic
KF5::Archive)
install(TARGETS plasma_applet_comic DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/applets)
install(TARGETS plasma_applet_comic DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/applets)
#install(FILES plasma-comic-default.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES comic.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
install(FILES comic.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
plasma_install_package(package org.kde.plasma.comic)
......@@ -5,7 +5,7 @@ plasma_install_package(package org.kde.plasma_applet_dict)
#######################################################################################
# Icon for the package
install(FILES accessories-dictionary.svgz
DESTINATION ${DATA_INSTALL_DIR}/icons/hicolor/scalable/apps/)
DESTINATION ${KDE_INSTALL_ICONDIR}/hicolor/scalable/apps/)
#######################################################################################
# C++ Plugin
......@@ -29,6 +29,6 @@ target_link_libraries(dictplugin
Qt5::WebEngine
)
install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/dict)
install(TARGETS dictplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/dict)
install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/dict)
install(TARGETS dictplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/dict)
......@@ -22,8 +22,8 @@ target_link_libraries(diskquotaplugin
KF5::CoreAddons
KF5::I18n)
install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/diskquota)
install(TARGETS diskquotaplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/diskquota)
install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/diskquota)
install(TARGETS diskquotaplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/diskquota)
install(FILES "icons/quota.svg"
DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/default/icons/)
\ No newline at end of file
install(FILES fifteenpuzzle.svgz
DESTINATION ${DATA_INSTALL_DIR}/icons/hicolor/scalable/apps/)
DESTINATION ${KDE_INSTALL_ICONDIR}/hicolor/scalable/apps/)
plasma_install_package(package org.kde.plasma.fifteenpuzzle)
......@@ -11,5 +11,5 @@ set(fifteenpuzzleplugin_SRCS
add_library(fifteenpuzzleplugin SHARED ${fifteenpuzzleplugin_SRCS})
target_link_libraries(fifteenpuzzleplugin Qt5::Quick Qt5::Qml)
install(TARGETS fifteenpuzzleplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/fifteenpuzzle)
install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/fifteenpuzzle)
install(TARGETS fifteenpuzzleplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/fifteenpuzzle)
install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/fifteenpuzzle)
......@@ -15,8 +15,8 @@ target_link_libraries(mediaframeplugin
KF5::KIOCore
KF5::KIOWidgets)
install(TARGETS mediaframeplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/mediaframe)
install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/mediaframe)
install(TARGETS mediaframeplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/mediaframe)
install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/mediaframe)
......
......@@ -15,7 +15,7 @@ target_link_libraries(minimizeallplugin
KF5::WindowSystem
)
install(TARGETS minimizeallplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/minimizeall)
install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/minimizeall)
install(TARGETS minimizeallplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/minimizeall)
install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/minimizeall)
plasma_install_package(package org.kde.plasma.minimizeall)
......@@ -17,11 +17,11 @@ set(notes_SRCS
plugin/notesplugin.cpp
)
install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/notes)
add_library(notesplugin SHARED ${notes_SRCS})
target_link_libraries(notesplugin
Qt5::Quick
KF5::CoreAddons)
install(TARGETS notesplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/notes)
install(TARGETS notesplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/notes)
install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/notes)
install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/purpose)
set(purposeplugin_SRCS
purposeplugin.cpp
contenttracker.cpp
......@@ -15,4 +13,5 @@ target_link_libraries(purposeplugin
Qt5::DBus
KF5::CoreAddons)
install(TARGETS purposeplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/purpose)
install(TARGETS purposeplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/purpose)
install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/purpose)
......@@ -7,7 +7,6 @@ set(showdesktop_SRCS
plugin/showdesktopplugin.cpp
)
install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/showdesktop)
add_library(showdesktopplugin SHARED ${showdesktop_SRCS})
target_link_libraries(showdesktopplugin
......@@ -23,4 +22,5 @@ if (Qt5X11Extras_FOUND)
)
endif()
install(TARGETS showdesktopplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/showdesktop)
install(TARGETS showdesktopplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/showdesktop)
install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/showdesktop)
......@@ -7,7 +7,6 @@ set(timer_SRCS
plugin/timerplugin.cpp
)
install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/timer)
add_library(timerplugin SHARED ${timer_SRCS})
target_link_libraries(timerplugin
......@@ -15,7 +14,8 @@ target_link_libraries(timerplugin
Qt5::Qml
)
install(TARGETS timerplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/timer)
install(TARGETS timerplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/timer)
install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/timer)
install(FILES timer.svgz
DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/default/widgets/)
......
......@@ -18,9 +18,9 @@ target_link_libraries(plasma_engine_comic plasmacomicprovidercore
kcoreaddons_desktop_to_json(plasma_engine_comic plasma-dataengine-comic.desktop SERVICE_TYPES plasma-dataengine.desktop)
install(TARGETS plasma_engine_comic DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine)
install(TARGETS plasma_engine_comic DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/dataengine)
install(FILES plasma-dataengine-comic.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install(FILES plasma-dataengine-comic.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
set(comicpackage_SRCS
......@@ -37,7 +37,7 @@ target_link_libraries( plasma_packagestructure_comic
KF5::I18n
)
kcoreaddons_desktop_to_json(plasma_packagestructure_comic plasma-packagestructure-comic.desktop SERVICE_TYPES plasma-packagestructure.desktop)
install(TARGETS plasma_packagestructure_comic DESTINATION ${PLUGIN_INSTALL_DIR}/kpackage/packagestructure)
install(TARGETS plasma_packagestructure_comic DESTINATION ${KDE_INSTALL_PLUGINDIR}/kpackage/packagestructure)
########### plugin core library ############
......@@ -62,7 +62,7 @@ set_target_properties(plasmacomicprovidercore PROPERTIES VERSION 1.0.0 SOVERSION
install( TARGETS plasmacomicprovidercore ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP )
install( FILES plasma_comicprovider.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES plasma_comicprovider.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR} )
########### kross ###############
......@@ -84,4 +84,4 @@ target_link_libraries(plasma_comic_krossprovider plasmacomicprovidercore
kcoreaddons_desktop_to_json(plasma_comic_krossprovider plasma-packagestructure-comic.desktop SERVICE_TYPES plasma-packagestructure.desktop)
install( TARGETS plasma_comic_krossprovider DESTINATION ${PLUGIN_INSTALL_DIR} )
install( TARGETS plasma_comic_krossprovider DESTINATION ${KDE_INSTALL_PLUGINDIR} )
......@@ -14,7 +14,7 @@ target_link_libraries(plasma_engine_konsoleprofiles
kcoreaddons_desktop_to_json(plasma_engine_konsoleprofiles plasma-dataengine-konsoleprofiles.desktop SERVICE_TYPES plasma-dataengine.desktop)
install(TARGETS plasma_engine_konsoleprofiles DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine)
install(FILES plasma-dataengine-konsoleprofiles.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install(TARGETS plasma_engine_konsoleprofiles DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/dataengine)
install(FILES plasma-dataengine-konsoleprofiles.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install(FILES org.kde.plasma.dataengine.konsoleprofiles.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services)
......@@ -11,8 +11,8 @@ target_link_libraries(plasma_engine_potd plasmapotdprovidercore
kcoreaddons_desktop_to_json(plasma_engine_potd plasma-dataengine-potd.desktop SERVICE_TYPES plasma-dataengine.desktop)
install(TARGETS plasma_engine_potd DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine )
install(FILES plasma-dataengine-potd.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install(TARGETS plasma_engine_potd DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/dataengine )
install(FILES plasma-dataengine-potd.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
########### plugin core library ############
......@@ -40,7 +40,7 @@ target_link_libraries( plasma_potd_flickrprovider plasmapotdprovidercore KF5::KI
kcoreaddons_desktop_to_json(plasma_potd_flickrprovider flickrprovider.desktop SERVICE_TYPES ${CMAKE_CURRENT_SOURCE_DIR}/plasma_potdprovider.desktop)
install( TARGETS plasma_potd_flickrprovider DESTINATION ${PLUGIN_INSTALL_DIR}/potd )
install( TARGETS plasma_potd_flickrprovider DESTINATION ${KDE_INSTALL_PLUGINDIR}/potd )
set( potd_apod_provider_SRCS
apodprovider.cpp
......@@ -51,7 +51,7 @@ target_link_libraries( plasma_potd_apodprovider plasmapotdprovidercore KF5::KIOC
kcoreaddons_desktop_to_json(plasma_potd_apodprovider apodprovider.desktop SERVICE_TYPES ${CMAKE_CURRENT_SOURCE_DIR}/plasma_potdprovider.desktop)
install( TARGETS plasma_potd_apodprovider DESTINATION ${PLUGIN_INSTALL_DIR}/potd )
install( TARGETS plasma_potd_apodprovider DESTINATION ${KDE_INSTALL_PLUGINDIR}/potd )
set( potd_natgeo_provider_SRCS
natgeoprovider.cpp
......@@ -62,7 +62,7 @@ target_link_libraries( plasma_potd_natgeoprovider plasmapotdprovidercore KF5::KI
kcoreaddons_desktop_to_json(plasma_potd_natgeoprovider natgeoprovider.desktop SERVICE_TYPES ${CMAKE_CURRENT_SOURCE_DIR}/plasma_potdprovider.desktop)
install( TARGETS plasma_potd_natgeoprovider DESTINATION ${PLUGIN_INSTALL_DIR}/potd )
install( TARGETS plasma_potd_natgeoprovider DESTINATION ${KDE_INSTALL_PLUGINDIR}/potd )
set( potd_epod_provider_SRCS
epodprovider.cpp
......@@ -73,7 +73,7 @@ target_link_libraries( plasma_potd_epodprovider plasmapotdprovidercore KF5::KIOC
kcoreaddons_desktop_to_json(plasma_potd_epodprovider epodprovider.desktop SERVICE_TYPES ${CMAKE_CURRENT_SOURCE_DIR}/plasma_potdprovider.desktop)
install( TARGETS plasma_potd_epodprovider DESTINATION ${PLUGIN_INSTALL_DIR}/potd )
install( TARGETS plasma_potd_epodprovider DESTINATION ${KDE_INSTALL_PLUGINDIR}/potd )
set( potd_noaa_provider_SRCS
noaaprovider.cpp
......@@ -84,7 +84,7 @@ target_link_libraries( plasma_potd_noaaprovider plasmapotdprovidercore KF5::KIOC
kcoreaddons_desktop_to_json(plasma_potd_noaaprovider noaaprovider.desktop SERVICE_TYPES ${CMAKE_CURRENT_SOURCE_DIR}/plasma_potdprovider.desktop)
install( TARGETS plasma_potd_noaaprovider DESTINATION ${PLUGIN_INSTALL_DIR}/potd )
install( TARGETS plasma_potd_noaaprovider DESTINATION ${KDE_INSTALL_PLUGINDIR}/potd )
set( potd_wcpotd_provider_SRCS
wcpotdprovider.cpp
......@@ -95,7 +95,7 @@ target_link_libraries( plasma_potd_wcpotdprovider plasmapotdprovidercore KF5::KI
kcoreaddons_desktop_to_json(plasma_potd_wcpotdprovider wcpotdprovider.desktop SERVICE_TYPES ${CMAKE_CURRENT_SOURCE_DIR}/plasma_potdprovider.desktop)
install( TARGETS plasma_potd_wcpotdprovider DESTINATION ${PLUGIN_INSTALL_DIR}/potd )
install( TARGETS plasma_potd_wcpotdprovider DESTINATION ${KDE_INSTALL_PLUGINDIR}/potd )
set( potd_bing_provider_SRCS
bingprovider.cpp
......@@ -106,4 +106,4 @@ target_link_libraries( plasma_potd_bingprovider plasmapotdprovidercore KF5::KIOC
kcoreaddons_desktop_to_json(plasma_potd_bingprovider bingprovider.desktop SERVICE_TYPES ${CMAKE_CURRENT_SOURCE_DIR}/plasma_potdprovider.desktop)
install( TARGETS plasma_potd_bingprovider DESTINATION ${PLUGIN_INSTALL_DIR}/potd )
install( TARGETS plasma_potd_bingprovider DESTINATION ${KDE_INSTALL_PLUGINDIR}/potd )
......@@ -6,6 +6,6 @@ set(krunner_converter_SRCS
add_library(krunner_converter MODULE ${krunner_converter_SRCS})
target_link_libraries(krunner_converter KF5::UnitConversion KF5::KIOCore KF5::I18n KF5::Runner)
install(TARGETS krunner_converter DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-runner-converter.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(TARGETS krunner_converter DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasma-runner-converter.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......@@ -11,5 +11,5 @@ target_link_libraries(krunner_datetime
KF5::I18n
)
install(TARGETS krunner_datetime DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-runner-datetime.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(TARGETS krunner_datetime DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasma-runner-datetime.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......@@ -9,5 +9,5 @@ add_library(kcm_krunner_dictionary MODULE ${kcm_dictionaryrunner_SRCS})
target_link_libraries(krunner_dictionary KF5::Runner KF5::I18n KF5::KCMUtils)
target_link_libraries(kcm_krunner_dictionary KF5::Runner KF5::I18n KF5::KCMUtils)
install(TARGETS krunner_dictionary kcm_krunner_dictionary DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-runner-dictionary.desktop plasma-runner-dictionary_config.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(TARGETS krunner_dictionary kcm_krunner_dictionary DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasma-runner-dictionary.desktop plasma-runner-dictionary_config.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......@@ -7,5 +7,5 @@ set(krunner_katesessions_SRCS
add_library(krunner_katesessions MODULE ${krunner_katesessions_SRCS})
target_link_libraries(krunner_katesessions KF5::KIOCore KF5::I18n KF5::Runner)
install(TARGETS krunner_katesessions DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-runner-katesessions.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(TARGETS krunner_katesessions DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasma-runner-katesessions.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......@@ -26,6 +26,6 @@ target_link_libraries(krunner_spellcheck
)
install(TARGETS krunner_spellcheck kcm_krunner_spellcheck
DESTINATION ${PLUGIN_INSTALL_DIR})
DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasma-runner-spellchecker.desktop plasma-runner-spellchecker_config.desktop
DESTINATION ${SERVICES_INSTALL_DIR})
DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment