summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-03-19 09:25:12 +0100
committerMontel Laurent <[email protected]>2015-03-19 09:25:12 +0100
commit3c7d0832eeb00bdcd3f54ca4d0efd38ba8612d06 (patch)
tree2c2aa42af0842af40f33241eb0bb455a74f88ee0
parentfde370b8ca6cf803e3765faee585d6401db9b224 (diff)
Use new kde macro variable
-rw-r--r--CMakeLists.txt2
-rw-r--r--data/CMakeLists.txt2
-rw-r--r--data/langs/CMakeLists.txt2
-rw-r--r--doc/CMakeLists.txt2
-rw-r--r--icons/CMakeLists.txt2
-rw-r--r--pics/CMakeLists.txt2
-rw-r--r--sounds/CMakeLists.txt4
-rw-r--r--src/CMakeLists.txt12
-rw-r--r--themes/aqua/CMakeLists.txt2
-rw-r--r--themes/desert/CMakeLists.txt2
-rw-r--r--themes/kids/CMakeLists.txt2
-rw-r--r--themes/savannah/CMakeLists.txt2
12 files changed, 18 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24f6ff7..b280cf2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,7 @@ ecm_optional_add_subdirectory( icons )
ecm_optional_add_subdirectory( themes )
ecm_optional_add_subdirectory( tests )
-install(FILES klettres.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
+install(FILES klettres.appdata.xml DESTINATION ${KDE_INSTALL_DATAROOTDIR}/appdata/)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index bf1f47a..78fb6b2 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -2,4 +2,4 @@ add_subdirectory(langs)
########### install files ###############
-install( FILES sounds.xml DESTINATION ${DATA_INSTALL_DIR}/klettres/data )
+install( FILES sounds.xml DESTINATION ${KDE_INSTALL_DATADIR}/klettres/data )
diff --git a/data/langs/CMakeLists.txt b/data/langs/CMakeLists.txt
index b745dc0..eda62f1 100644
--- a/data/langs/CMakeLists.txt
+++ b/data/langs/CMakeLists.txt
@@ -1,2 +1,2 @@
-install( FILES cs.txt da.txt sk.txt es.txt de.txt nds.txt hu.txt DESTINATION ${DATA_INSTALL_DIR}/klettres )
+install( FILES cs.txt da.txt sk.txt es.txt de.txt nds.txt hu.txt DESTINATION ${KDE_INSTALL_DATADIR}/klettres )
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 61f0cee..d58d28a 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
########### install files ###############
#
#
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR klettres)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR klettres)
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index a4dcf42..65b719c 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -18,4 +18,4 @@ hi64-actions-klettres_desert.png
hi64-actions-klettres_grownup.png
hi64-actions-klettres_kids.png
DESTINATION
-${DATA_INSTALL_DIR}/klettres/icons )
+${KDE_INSTALL_DATADIR}/klettres/icons )
diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
index c6a9d7a..69bf6e9 100644
--- a/pics/CMakeLists.txt
+++ b/pics/CMakeLists.txt
@@ -1,2 +1,2 @@
-install( FILES klettres_kids.jpeg klettres_grownup.png klettres_desert.png DESTINATION ${DATA_INSTALL_DIR}/klettres/pics )
+install( FILES klettres_kids.jpeg klettres_grownup.png klettres_desert.png DESTINATION ${KDE_INSTALL_DATADIR}/klettres/pics )
diff --git a/sounds/CMakeLists.txt b/sounds/CMakeLists.txt
index dd2d961..396f423 100644
--- a/sounds/CMakeLists.txt
+++ b/sounds/CMakeLists.txt
@@ -2,10 +2,10 @@ set(langdir fr en )
set(sublangdir alpha syllab )
foreach (_langcurrentdir ${langdir})
file(GLOB _xmlfile "${_langcurrentdir}/*.xml" )
- install(FILES ${_xmlfile} DESTINATION ${DATA_INSTALL_DIR}/klettres/${_langcurrentdir})
+ install(FILES ${_xmlfile} DESTINATION ${KDE_INSTALL_DATADIR}/klettres/${_langcurrentdir})
foreach(_sublangcurrentdir ${sublangdir})
file(GLOB _oggfile "${_langcurrentdir}/${_sublangcurrentdir}/*.ogg" )
- install(FILES ${_oggfile} DESTINATION ${DATA_INSTALL_DIR}/klettres/${_langcurrentdir}/${_sublangcurrentdir})
+ install(FILES ${_oggfile} DESTINATION ${KDE_INSTALL_DATADIR}/klettres/${_langcurrentdir}/${_sublangcurrentdir})
endforeach(_sublangcurrentdir ${sublangdir} )
endforeach(_langcurrentdir ${langdir})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cb892ad..eb6adc9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -38,14 +38,14 @@ target_link_libraries(klettres
${PHONON_LIBRARY}
Qt5::Xml)
-install(TARGETS klettres ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS klettres ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
########### install files ###############
-install( PROGRAMS org.kde.klettres.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES klettresui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/klettres )
-install( FILES klettres.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
-install( FILES klettres.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
+install( PROGRAMS org.kde.klettres.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
+install( FILES klettresui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/klettres )
+install( FILES klettres.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )
+install( FILES klettres.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} )
-ecm_install_icons( ICONS 128-apps-klettres.png 16-apps-klettres.png 22-apps-klettres.png 32-apps-klettres.png 48-apps-klettres.png 64-apps-klettres.png DESTINATION ${ICON_INSTALL_DIR} )
+ecm_install_icons( ICONS 128-apps-klettres.png 16-apps-klettres.png 22-apps-klettres.png 32-apps-klettres.png 48-apps-klettres.png 64-apps-klettres.png DESTINATION ${KDE_INSTALL_ICONDIR} )
diff --git a/themes/aqua/CMakeLists.txt b/themes/aqua/CMakeLists.txt
index 1c5e64f..ae6484f 100644
--- a/themes/aqua/CMakeLists.txt
+++ b/themes/aqua/CMakeLists.txt
@@ -1,4 +1,4 @@
-install( FILES klettres_aqua.svg DESTINATION ${DATA_INSTALL_DIR}/klettres/pics/aqua )
+install( FILES klettres_aqua.svg DESTINATION ${KDE_INSTALL_DATADIR}/klettres/pics/aqua )
diff --git a/themes/desert/CMakeLists.txt b/themes/desert/CMakeLists.txt
index 78c7801..f11d665 100644
--- a/themes/desert/CMakeLists.txt
+++ b/themes/desert/CMakeLists.txt
@@ -1,4 +1,4 @@
-install( FILES klettres_desert.svg DESTINATION ${DATA_INSTALL_DIR}/klettres/pics/desert )
+install( FILES klettres_desert.svg DESTINATION ${KDE_INSTALL_DATADIR}/klettres/pics/desert )
diff --git a/themes/kids/CMakeLists.txt b/themes/kids/CMakeLists.txt
index c881af8..ad0c6c6 100644
--- a/themes/kids/CMakeLists.txt
+++ b/themes/kids/CMakeLists.txt
@@ -1,4 +1,4 @@
-install( FILES klettres_kids.svg DESTINATION ${DATA_INSTALL_DIR}/klettres/pics/kids )
+install( FILES klettres_kids.svg DESTINATION ${KDE_INSTALL_DATADIR}/klettres/pics/kids )
diff --git a/themes/savannah/CMakeLists.txt b/themes/savannah/CMakeLists.txt
index 62574dd..f74b2ef 100644
--- a/themes/savannah/CMakeLists.txt
+++ b/themes/savannah/CMakeLists.txt
@@ -1,4 +1,4 @@
-install( FILES klettres_savannah.svg DESTINATION ${DATA_INSTALL_DIR}/klettres/pics/savannah )
+install( FILES klettres_savannah.svg DESTINATION ${KDE_INSTALL_DATADIR}/klettres/pics/savannah )