summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <[email protected]>2017-07-19 00:22:05 +0200
committerFriedrich W. H. Kossebau <[email protected]>2017-07-19 00:22:05 +0200
commita59b96c09f528d7dafb8cef19563639dfa74b791 (patch)
tree4a58537af894cc3f89a7415009db108331f487a3
parent5663eba5881106c6f156e0bc7d36ca4e4d2732ee (diff)
Use non-deprecated KDEInstallDir variables
-rw-r--r--doc/CMakeLists.txt2
-rw-r--r--icons/CMakeLists.txt2
-rw-r--r--src/application/CMakeLists.txt6
-rw-r--r--src/templates/C++/ktexteditor/CMakeLists.txt2
4 files changed, 6 insertions, 6 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index e1e68b3..99e2528 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1 +1 @@
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kapptemplate)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kapptemplate)
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 018144f..979d8b4 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -8,4 +8,4 @@ set(kapptemplate_ICONS
sc-apps-kapptemplate.svg
)
-ecm_install_icons(ICONS ${kapptemplate_ICONS} DESTINATION ${ICON_INSTALL_DIR} THEME hicolor)
+ecm_install_icons(ICONS ${kapptemplate_ICONS} DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor)
diff --git a/src/application/CMakeLists.txt b/src/application/CMakeLists.txt
index 5d48f43..5c2605a 100644
--- a/src/application/CMakeLists.txt
+++ b/src/application/CMakeLists.txt
@@ -24,8 +24,8 @@ target_link_libraries(kapptemplate
KF5::NewStuff
)
-install(TARGETS kapptemplate ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(PROGRAMS org.kde.kapptemplate.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(TARGETS kapptemplate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install(PROGRAMS org.kde.kapptemplate.desktop DESTINATION ${KDE_INSTALL_APPDIR})
install(FILES org.kde.kapptemplate.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
-install(FILES kapptemplate.kcfg DESTINATION ${KCFG_INSTALL_DIR})
+install(FILES kapptemplate.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
install(FILES kapptemplate.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
diff --git a/src/templates/C++/ktexteditor/CMakeLists.txt b/src/templates/C++/ktexteditor/CMakeLists.txt
index 208eaae..8ddf801 100644
--- a/src/templates/C++/ktexteditor/CMakeLists.txt
+++ b/src/templates/C++/ktexteditor/CMakeLists.txt
@@ -27,4 +27,4 @@ add_library(%{APPNAMELC} MODULE ${%{APPNAMELC}_SRCS})
target_link_libraries(%{APPNAMELC} KF5::TextEditor)
-install(TARGETS %{APPNAMELC} DESTINATION ${PLUGIN_INSTALL_DIR}/ktexteditor)
+install(TARGETS %{APPNAMELC} DESTINATION ${KDE_INSTALL_PLUGINDIR}/ktexteditor)