Commit 3cffbfa5 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Use non-deprecated KDEInstallDirs variables

parent 41378bc4
......@@ -13,4 +13,4 @@ target_link_libraries(plasma_applet_appmenu
KF5::Plasma
KF5::WindowSystem)
install(TARGETS plasma_applet_appmenu DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/applets)
install(TARGETS plasma_applet_appmenu DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/applets)
......@@ -9,6 +9,6 @@ kcoreaddons_desktop_to_json(plasma_applet_calendar package/metadata.desktop)
target_link_libraries(plasma_applet_calendar
KF5::Plasma)
install(TARGETS plasma_applet_calendar DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/applets)
install(TARGETS plasma_applet_calendar DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/applets)
plasma_install_package(package org.kde.plasma.calendar)
......@@ -15,6 +15,6 @@ target_link_libraries(plasma_applet_icon
KF5::KIOWidgets # for KRun
KF5::Plasma)
install(TARGETS plasma_applet_icon DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/applets)
install(TARGETS plasma_applet_icon DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/applets)
plasma_install_package(package org.kde.plasma.icon)
......@@ -11,4 +11,4 @@ target_link_libraries(plasma_applet_notifications
KF5::Plasma
KF5::ConfigCore)
install(TARGETS plasma_applet_notifications DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/applets)
install(TARGETS plasma_applet_notifications DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/applets)
......@@ -123,13 +123,13 @@
#cmakedefine KDE_DEFAULT_HOME "${KDE_DEFAULT_HOME}"
/* KDE's binaries directory */
#define KDE_BINDIR "${BIN_INSTALL_DIR}"
#define KDE_BINDIR "${KDE_INSTALL_BINDIR}"
/* KDE's configuration directory */
#define KDE_CONFDIR "${CONFIG_INSTALL_DIR}"
#define KDE_CONFDIR "${KDE_INSTALL_CONFDIR}"
/* KDE's static data directory */
#define KDE_DATADIR "${DATA_INSTALL_DIR}"
#define KDE_DATADIR "${KDE_INSTALL_DATADIR}"
/* Define where your java executable is */
#undef PATH_JAVA
......
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/screenlocker)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/screenlocker)
......@@ -10,7 +10,7 @@ target_link_libraries(kio_desktop Qt5::DBus Qt5::Gui KF5::KIOCore KF5::I18n)
set_target_properties(kio_desktop PROPERTIES OUTPUT_NAME "desktop")
install(TARGETS kio_desktop DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kio)
install(TARGETS kio_desktop DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
########### next target ###############
......@@ -18,11 +18,11 @@ add_library(desktopnotifier MODULE desktopnotifier.cpp)
kcoreaddons_desktop_to_json(desktopnotifier desktopnotifier.desktop)
target_link_libraries(desktopnotifier KF5::KIOCore KF5::DBusAddons)
install(TARGETS desktopnotifier DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kded)
install(TARGETS desktopnotifier DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kded)
########### install files ###############
install( FILES desktop.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES desktop.protocol DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install(FILES directory.desktop directory.trash DESTINATION ${DATA_INSTALL_DIR}/kio_desktop)
install(FILES Home.desktop DESTINATION ${DATA_INSTALL_DIR}/kio_desktop/DesktopLinks)
install(FILES directory.desktop directory.trash DESTINATION ${KDE_INSTALL_DATADIR}/kio_desktop)
install(FILES Home.desktop DESTINATION ${KDE_INSTALL_DATADIR}/kio_desktop/DesktopLinks)
......@@ -6,7 +6,7 @@ add_executable(krunnerplugins ${krunnerplugins_SRCS})
target_link_libraries(krunnerplugins KF5::CoreAddons KF5::Service KF5::Runner KF5::ConfigCore)
install(TARGETS krunnerplugins DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/)
install(FILES krunnerplugins.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
install(TARGETS krunnerplugins DESTINATION ${KDE_INSTALL_LIBDIR}/kconf_update_bin/)
install(FILES krunnerplugins.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR})
......@@ -8,4 +8,4 @@ target_link_libraries(colorcorrectlocationupdater
KF5::CoreAddons
colorcorrect)
install(TARGETS colorcorrectlocationupdater DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kded)
install(TARGETS colorcorrectlocationupdater DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kded)
......@@ -10,11 +10,11 @@ target_link_libraries(holidaysevents Qt5::Core
)
install (TARGETS holidaysevents
DESTINATION ${PLUGIN_INSTALL_DIR}/plasmacalendarplugins
DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasmacalendarplugins
)
install (FILES HolidaysConfig.qml
DESTINATION ${PLUGIN_INSTALL_DIR}/plasmacalendarplugins/holidays
DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasmacalendarplugins/holidays
)
add_subdirectory(qmlhelper)
......@@ -3,5 +3,5 @@ add_definitions(-DTRANSLATION_DOMAIN="plasma_runner_appstream")
add_library(appstreamrunner MODULE appstreamrunner.cpp)
target_link_libraries(appstreamrunner PUBLIC KF5::Runner KF5::I18n KF5::Service AppStreamQt)
install(TARGETS appstreamrunner DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES appstreamrunner.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(TARGETS appstreamrunner DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES appstreamrunner.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......@@ -21,7 +21,7 @@ configure_file(org.kde.baloorunner.service.in
install(
TARGETS baloorunner
DESTINATION ${LIBEXEC_INSTALL_DIR}
DESTINATION ${KDE_INSTALL_LIBEXECDIR}
)
install(
......
......@@ -32,4 +32,4 @@ target_link_libraries(systemmonitor
)
install(TARGETS systemmonitor DESTINATION ${KDE_INSTALL_BINDIR})
install(PROGRAMS org.kde.systemmonitor.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
install(PROGRAMS org.kde.systemmonitor.desktop DESTINATION ${KDE_INSTALL_APPDIR})
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