Commit 2fc98d5e authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Use non-deprecated KDEInstallDirs variables

parent 0343db5a
......@@ -54,7 +54,7 @@ ecm_qt_declare_logging_category(kickerplugin_SRCS
qt5_add_dbus_interface(kickerplugin_SRCS ${KRUNNERAPP_INTERFACE} krunner_interface)
qt5_add_dbus_interface(kickerplugin_SRCS ${KSMSERVER_DBUS_INTERFACE} ksmserver_interface)
install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/kicker)
install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/kicker)
add_library(kickerplugin SHARED ${kickerplugin_SRCS})
......@@ -86,4 +86,4 @@ if (${HAVE_APPSTREAMQT})
target_link_libraries(kickerplugin AppStreamQt)
endif()
install(TARGETS kickerplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/kicker)
install(TARGETS kickerplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/kicker)
......@@ -9,8 +9,8 @@ set(kimpanelplugin_SRCS
plugin/kimpanelplugin.cpp
)
install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/kimpanel)
install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/kimpanel)
add_library(kimpanelplugin SHARED ${kimpanelplugin_SRCS})
target_link_libraries(kimpanelplugin Qt5::Gui Qt5::Qml)
install(TARGETS kimpanelplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/kimpanel)
install(TARGETS kimpanelplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/kimpanel)
......@@ -46,7 +46,7 @@ if(IBUS_FOUND AND GLIB2_FOUND AND GIO_FOUND AND GOBJECT_FOUND)
set_target_properties(kimpanel-ibus-panel-launcher PROPERTIES AUTOMOC TRUE)
target_link_libraries(kimpanel-ibus-panel-launcher Qt5::Core Qt5::DBus)
target_include_directories(kimpanel-ibus-panel-launcher PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
install(TARGETS kimpanel-ibus-panel kimpanel-ibus-panel-launcher DESTINATION ${LIBEXEC_INSTALL_DIR})
install(TARGETS kimpanel-ibus-panel kimpanel-ibus-panel-launcher DESTINATION ${KDE_INSTALL_LIBEXECDIR})
endif()
endif()
......@@ -3,7 +3,7 @@
<component>
<name>org.freedesktop.IBus.Panel</name>
<description>KDE IM Panel Component</description>
<exec>@LIBEXEC_INSTALL_DIR@/kimpanel-ibus-panel</exec>
<exec>@KDE_INSTALL_LIBEXECDIR@/kimpanel-ibus-panel</exec>
<version>1.5.8</version>
<author>Weng Xuetian &lt;wengxt@gmail.com&gt;</author>
<license>GPL</license>
......
......@@ -7,5 +7,5 @@ if(SCIM_FOUND)
add_executable(kimpanel-scim-panel ${kimpanel_scim_panel_SRCS})
set_target_properties(kimpanel-scim-panel PROPERTIES AUTOMOC TRUE)
target_link_libraries(kimpanel-scim-panel Qt5::Core Qt5::DBus ${SCIM_LIBRARIES})
install(TARGETS kimpanel-scim-panel DESTINATION ${LIBEXEC_INSTALL_DIR})
install(TARGETS kimpanel-scim-panel DESTINATION ${KDE_INSTALL_LIBEXECDIR})
endif(SCIM_FOUND)
......@@ -25,5 +25,5 @@ if (X11_FOUND)
target_link_libraries(pagerplugin Qt5::X11Extras)
endif()
install(TARGETS pagerplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/pager)
install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/pager)
install(TARGETS pagerplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/pager)
install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/pager)
......@@ -11,7 +11,7 @@ set(taskmanagerplugin_SRCS
plugin/smartlaunchers/smartlauncheritem.cpp
)
install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/taskmanager)
install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/taskmanager)
add_library(taskmanagerplugin SHARED ${taskmanagerplugin_SRCS})
......@@ -31,4 +31,4 @@ target_link_libraries(taskmanagerplugin
KF5::Service
KF5::WindowSystem)
install(TARGETS taskmanagerplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/taskmanager)
install(TARGETS taskmanagerplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/taskmanager)
......@@ -14,6 +14,6 @@ target_link_libraries(trashplugin
KF5::GuiAddons
)
install(TARGETS trashplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/trash)
install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/trash)
install(TARGETS trashplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/trash)
install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/trash)
......@@ -9,5 +9,5 @@ ecm_qt_declare_logging_category(SRCS
add_library(attica_kde MODULE kdeplatformdependent.cpp ${SRCS})
target_link_libraries(attica_kde KF5::KIOWidgets Qt5::Widgets KF5::KCMUtils KF5::Attica KF5::Wallet KF5::I18n )
install(TARGETS attica_kde DESTINATION ${PLUGIN_INSTALL_DIR})
install(TARGETS attica_kde DESTINATION ${KDE_INSTALL_PLUGINDIR})
......@@ -126,13 +126,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
......
......@@ -3,7 +3,7 @@ set(desktopplugin_SRCS
infonotification.cpp
)
install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/private/desktopcontainment/desktop)
install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/private/desktopcontainment/desktop)
add_library(desktopplugin SHARED ${desktopplugin_SRCS})
......@@ -14,4 +14,4 @@ target_link_libraries(desktopplugin
Qt5::Widgets
KF5::Notifications)
install(TARGETS desktopplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/private/desktopcontainment/desktop)
install(TARGETS desktopplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/private/desktopcontainment/desktop)
......@@ -23,7 +23,7 @@ set(folderplugin_SRCS
screenmapper.cpp
)
install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/private/desktopcontainment/folder)
install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/private/desktopcontainment/folder)
add_library(folderplugin SHARED ${folderplugin_SRCS})
......@@ -38,7 +38,7 @@ target_link_libraries(folderplugin
KF5::PlasmaQuick
KF5::ConfigGui)
install(TARGETS folderplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/private/desktopcontainment/folder)
install(TARGETS folderplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/private/desktopcontainment/folder)
generate_export_header(folderplugin BASE_NAME folderplugin)
......
......@@ -27,9 +27,9 @@ target_link_libraries(plasma_engine_kimpanel
kcoreaddons_desktop_to_json(plasma_engine_kimpanel plasma-dataengine-kimpanel.desktop)
install(TARGETS plasma_engine_kimpanel
DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine)
DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/dataengine)
install(FILES plasma-dataengine-kimpanel.desktop
DESTINATION ${SERVICES_INSTALL_DIR})
DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(FILES kimpanel.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services)
########### install files ###############
#
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/autostart)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/autostart)
kdoctools_create_handbook(index.docbook
INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en
INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en
SUBDIR kcontrol/baloo)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/clock)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/clock)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/colors)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/colors)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/componentchooser)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/componentchooser)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/cursortheme)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/cursortheme)
########### install files ###############
#
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/desktopthemedetails)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/desktopthemedetails)
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