Use non-deprecated KDEInstallDirs variables

GIT_SILENT

Use non-deprecated KDEInstallDirs variables
GIT_SILENT
ff9053da · Friedrich W. H. Kossebau · 1ee310ad · ff9053da · ff9053da · ff9053da
Commit ff9053da authored Oct 04, 2022 by Friedrich W. H. Kossebau
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ project(kmuddy)

 cmake_minimum_required(VERSION 2.8.12)

-find_package(ECM 0.0.10 REQUIRED CONFIG)
+find_package(ECM 1.6.0 REQUIRED CONFIG)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR} ${ECM_MODULE_PATH})

 include(KDEInstallDirs)
@@ -42,7 +42,7 @@ add_subdirectory( scripting )

 ########### install files ###############

-install ( FILES muds.xml DESTINATION ${DATA_INSTALL_DIR}/kmuddy )
+install ( FILES muds.xml DESTINATION ${KDE_INSTALL_DATADIR}/kmuddy )

 ki18n_install(po)

--- a/kmuddy/CMakeLists.txt
+++ b/kmuddy/CMakeLists.txt
@@ -57,21 +57,21 @@ endif (MXP_FOUND)

 target_link_libraries(kmuddy ${KMUDDY_LIBRARIES} )

-install(TARGETS kmuddy DESTINATION ${BIN_INSTALL_DIR})
+install(TARGETS kmuddy DESTINATION ${KDE_INSTALL_BINDIR})

 # install the icons
 ecm_install_icons(ICONS
    16-apps-kmuddy.png
    32-apps-kmuddy.png
-    DESTINATION ${ICON_INSTALL_DIR}
+    DESTINATION ${KDE_INSTALL_ICONDIR}
    THEME hicolor
 )
 ecm_install_icons(ICONS
    16-apps-kmuddy.png
    32-apps-kmuddy.png
-    DESTINATION ${ICON_INSTALL_DIR}
+    DESTINATION ${KDE_INSTALL_ICONDIR}
    THEME locolor
 )

-install (FILES org.kde.kmuddy.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install (FILES org.kde.kmuddy.desktop DESTINATION ${KDE_INSTALL_APPDIR})

--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@ -59,12 +59,12 @@ add_library(kmuddycore SHARED ${kmuddycore_LIB_SRCS})
 target_link_libraries(kmuddycore KF5::KCMUtils KF5::I18n KF5::Service KF5::KDELibs4Support Qt5::Script Qt5::Multimedia)

 set_target_properties(kmuddycore PROPERTIES VERSION 2.0.0 SOVERSION 2 )
-install(TARGETS kmuddycore DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kmuddycore DESTINATION ${KDE_INSTALL_LIBDIR} )


 ########### install files ###############

-install( FILES  kmuddyplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
-install( FILES cplugin.h arith-exp.h cactionbase.h cactionmanager.h calias.h caliaslist.h cansiparser.h ccmdparser.h ccmdprocessor.h ccmdqueue.h cconsole.h cdownloader.h cexpresolver.h cinputline.h cmacromanager.h cmsp.h coutput.h cprompt.h csoundplayer.h cstatus.h ctextchunk.h cvalue.h cvariable.h cvariablelist.h cmenumanager.h cdialoglist.h cglobalsettings.h clistobject.h clist.h cpattern.h clistgroup.h clistmanager.h clistviewer.h clisteditor.h clistgroupeditor.h cprofilesettings.h cprofilemanager.h ctabwidget.h DESTINATION ${INCLUDE_INSTALL_DIR}/kmuddy )
+install( FILES  kmuddyplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR} )
+install( FILES cplugin.h arith-exp.h cactionbase.h cactionmanager.h calias.h caliaslist.h cansiparser.h ccmdparser.h ccmdprocessor.h ccmdqueue.h cconsole.h cdownloader.h cexpresolver.h cinputline.h cmacromanager.h cmsp.h coutput.h cprompt.h csoundplayer.h cstatus.h ctextchunk.h cvalue.h cvariable.h cvariablelist.h cmenumanager.h cdialoglist.h cglobalsettings.h clistobject.h clist.h cpattern.h clistgroup.h clistmanager.h clistviewer.h clisteditor.h clistgroupeditor.h cprofilesettings.h cprofilemanager.h ctabwidget.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kmuddy )


--- a/plugins/converter/CMakeLists.txt
+++ b/plugins/converter/CMakeLists.txt
@@ -29,10 +29,10 @@ add_library(kmuddyconverterplugin MODULE ${kmuddyconverterplugin_PART_SRCS})

 target_link_libraries(kmuddyconverterplugin  KF5::KDELibs4Support KF5::Parts  kmuddycore )

-install(TARGETS kmuddyconverterplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kmuddyconverterplugin DESTINATION ${KDE_INSTALL_PLUGINDIR} )


 ########### install files ###############

-install( FILES  kmuddyconverterplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES  kmuddyconverterplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )

--- a/plugins/mapper/CMakeLists.txt
+++ b/plugins/mapper/CMakeLists.txt
@@ -72,14 +72,14 @@ add_library(kmuddymapper MODULE ${kmuddymapper_PART_SRCS})

 target_link_libraries(kmuddymapper  KF5::KDELibs4Support KF5::Parts KF5::WidgetsAddons KF5::Service KF5::Archive kmuddycore )

-install(TARGETS kmuddymapper DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kmuddymapper DESTINATION ${KDE_INSTALL_PLUGINDIR} )


 ########### install files ###############

-install( FILES kmuddymapper.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kmuddymapperpart.rc DESTINATION ${DATA_INSTALL_DIR}/kmuddy )
-install( FILES kmuddymapperplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
-install( FILES kmud_grid.png kmud_create.png kmud_follow.png DESTINATION ${DATA_INSTALL_DIR}/kmuddy/toolbar )
-install( FILES plugins/standard/tools/kmud_select.png plugins/standard/tools/kmud_room.png plugins/standard/tools/kmud_text.png plugins/standard/tools/kmud_path.png plugins/standard/tools/kmud_eraser.png DESTINATION ${DATA_INSTALL_DIR}/kmuddy/toolbar )
+install( FILES kmuddymapper.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( FILES kmuddymapperpart.rc DESTINATION ${KDE_INSTALL_DATADIR}/kmuddy )
+install( FILES kmuddymapperplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR} )
+install( FILES kmud_grid.png kmud_create.png kmud_follow.png DESTINATION ${KDE_INSTALL_DATADIR}/kmuddy/toolbar )
+install( FILES plugins/standard/tools/kmud_select.png plugins/standard/tools/kmud_room.png plugins/standard/tools/kmud_text.png plugins/standard/tools/kmud_path.png plugins/standard/tools/kmud_eraser.png DESTINATION ${KDE_INSTALL_DATADIR}/kmuddy/toolbar )

--- a/plugins/scripting/CMakeLists.txt
+++ b/plugins/scripting/CMakeLists.txt
@@ -20,12 +20,12 @@ add_library(kmuddyscriptingplugin MODULE ${kmuddyscriptingplugin_PART_SRCS})

 target_link_libraries(kmuddyscriptingplugin KF5::KDELibs4Support KF5::Parts kmuddycore )

-install(TARGETS kmuddyscriptingplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kmuddyscriptingplugin DESTINATION ${KDE_INSTALL_PLUGINDIR} )


 ########### install files ###############

-install( FILES  kmuddyscriptingplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES  kmuddyscriptingplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )



--- a/plugins/strings/CMakeLists.txt
+++ b/plugins/strings/CMakeLists.txt
@@ -10,11 +10,11 @@ add_library(kmuddystringsplugin MODULE ${kmuddystringsplugin_PART_SRCS})

 target_link_libraries(kmuddystringsplugin  KF5::KDELibs4Support KF5::Parts  kmuddycore )

-install(TARGETS kmuddystringsplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kmuddystringsplugin DESTINATION ${KDE_INSTALL_PLUGINDIR} )


 ########### install files ###############

-install( FILES  kmuddystringsplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES  kmuddystringsplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )


--- a/plugins/test/CMakeLists.txt
+++ b/plugins/test/CMakeLists.txt
@@ -9,10 +9,10 @@ add_library(kmuddytestplugin MODULE ${kmuddytestplugin_PART_SRCS})

 target_link_libraries(kmuddytestplugin  KF5::KDELibs4Support KF5::Parts  kmuddycore )

-install(TARGETS kmuddytestplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kmuddytestplugin DESTINATION ${KDE_INSTALL_PLUGINDIR} )


 ########### install files ###############

-install( FILES  kmuddytestplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES  kmuddytestplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )

--- a/plugins/vartrigs/CMakeLists.txt
+++ b/plugins/vartrigs/CMakeLists.txt
@@ -15,12 +15,12 @@ add_library(kmuddyvartrigplugin MODULE ${kmuddyvartrigplugin_PART_SRCS})

 target_link_libraries(kmuddyvartrigplugin KF5::KDELibs4Support KF5::Parts  kmuddycore )

-install(TARGETS kmuddyvartrigplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kmuddyvartrigplugin DESTINATION ${KDE_INSTALL_PLUGINDIR} )


 ########### install files ###############

-install( FILES  kmuddyvartrigplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES  kmuddyvartrigplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )



--- a/plugins/varviewer/CMakeLists.txt
+++ b/plugins/varviewer/CMakeLists.txt
@@ -13,11 +13,11 @@ add_library(kmuddyvarviewerplugin MODULE ${kmuddyvarviewerplugin_PART_SRCS})

 target_link_libraries(kmuddyvarviewerplugin  KF5::KDELibs4Support KF5::Parts  kmuddycore )

-install(TARGETS kmuddyvarviewerplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kmuddyvarviewerplugin DESTINATION ${KDE_INSTALL_PLUGINDIR} )


 ########### install files ###############

-install( FILES  kmuddyvarviewerplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES  kmuddyvarviewerplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )


--- a/scripting/CMakeLists.txt
+++ b/scripting/CMakeLists.txt
@@ -3,7 +3,7 @@

 ########### install files ###############

-install( FILES  kmuddy-usock-client.pl kmuddy-usock-test.pl kmuddyvars.h locktest.c pre.c README testserver.cpp tmpserver.pl vartest.c DESTINATION ${DATA_INSTALL_DIR}/kmuddy )
+install( FILES  kmuddy-usock-client.pl kmuddy-usock-test.pl kmuddyvars.h locktest.c pre.c README testserver.cpp tmpserver.pl vartest.c DESTINATION ${KDE_INSTALL_DATADIR}/kmuddy )




--- a/template/CMakeLists.txt
+++ b/template/CMakeLists.txt
@@ -10,12 +10,12 @@ add_library(kmuddyplugintemplate MODULE ${kmuddyplugintemplate_PART_SRCS})

 target_link_libraries(kmuddyplugintemplate  KF5::KDELibs4Support KF5::Parts  kmuddycore )

-install(TARGETS kmuddyplugintemplate DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kmuddyplugintemplate DESTINATION ${KDE_INSTALL_PLUGINDIR} )


 ########### install files ###############

-install( FILES  kmuddyplugintemplate.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES  kmuddyplugintemplate.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )