summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-03-03 23:08:43 +0100
committerMontel Laurent <[email protected]>2015-03-03 23:08:43 +0100
commit6c2eeb5ceb2e2cabffb0ce22d5c7c4bd4137f8a3 (patch)
treeff034ef59989c22d74c2b4cef95db706f9463663
parentcc43d0cabdeb6383d39565f619a54ff462aac5d7 (diff)
Use new KDE_ macro
-rw-r--r--CMakeLists.txt3
-rw-r--r--doc/CMakeLists.txt2
-rw-r--r--doc/ksirkskineditor/CMakeLists.txt2
-rw-r--r--ksirk/CMakeLists.txt14
-rw-r--r--ksirk/iris/src/CMakeLists.txt2
-rw-r--r--ksirk/skins/CMakeLists.txt2
-rw-r--r--ksirk/skins/default/Data/CMakeLists.txt2
-rw-r--r--ksirk/skins/default/Images/CMakeLists.txt2
-rw-r--r--ksirk/skins/default/Images/work/sprites/CMakeLists.txt2
-rw-r--r--ksirk/skins/default/Sounds/CMakeLists.txt2
-rw-r--r--ksirk/skins/legacy/Data/CMakeLists.txt2
-rw-r--r--ksirk/skins/legacy/Images/CMakeLists.txt2
-rw-r--r--ksirk/skins/legacy/Images/work/sprites/CMakeLists.txt2
-rw-r--r--ksirk/skins/legacy/Sounds/CMakeLists.txt2
-rw-r--r--ksirk/skins/realpol/Data/CMakeLists.txt2
-rw-r--r--ksirk/skins/realpol/Images/CMakeLists.txt2
-rw-r--r--ksirk/skins/realpol/Images/sprites/CMakeLists.txt2
-rw-r--r--ksirk/skins/realpol/Sounds/CMakeLists.txt2
-rw-r--r--ksirk/skins/static/Data/CMakeLists.txt2
-rw-r--r--ksirk/skins/static/Images/CMakeLists.txt2
-rw-r--r--ksirk/skins/static/Sounds/CMakeLists.txt2
-rw-r--r--ksirkskineditor/CMakeLists.txt12
22 files changed, 34 insertions, 33 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96165ea..47ce7a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ project(ksirk)
cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
set (QT_MIN_VERSION "5.2.0")
-find_package(ECM 1.3.0 REQUIRED CONFIG)
+find_package(ECM 1.7.0 REQUIRED CONFIG)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test)
@@ -30,6 +30,7 @@ find_package(KF5KDEGames 4.9.0 REQUIRED)
find_package(Phonon4Qt5 REQUIRED)
include(FeatureSummary)
+include(ECMAddAppIcon)
include(ECMInstallIcons)
include(KDEInstallDirs)
include(KDECompilerSettings)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index cb520c2..4417ea0 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
add_subdirectory(ksirkskineditor)
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR ksirk)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR ksirk)
diff --git a/doc/ksirkskineditor/CMakeLists.txt b/doc/ksirkskineditor/CMakeLists.txt
index 71f8544..14b093c 100644
--- a/doc/ksirkskineditor/CMakeLists.txt
+++ b/doc/ksirkskineditor/CMakeLists.txt
@@ -1,2 +1,2 @@
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR ksirkskineditor)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR ksirkskineditor)
diff --git a/ksirk/CMakeLists.txt b/ksirk/CMakeLists.txt
index 1f71ab5..a28e4f0 100644
--- a/ksirk/CMakeLists.txt
+++ b/ksirk/CMakeLists.txt
@@ -128,14 +128,14 @@ target_link_libraries(ksirk
KF5::Wallet
)
-install( TARGETS ksirk ${INSTALL_TARGETS_DEFAULT_ARGS})
+install( TARGETS ksirk ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
-ecm_install_icons( ICONS hi128-apps-ksirk.png hi16-apps-ksirk.png hi22-apps-ksirk.png hi32-apps-ksirk.png hi48-apps-ksirk.png hi64-apps-ksirk.png lo16-apps-ksirk.png lo32-apps-ksirk.png DESTINATION ${ICON_INSTALL_DIR} )
+ecm_install_icons( ICONS hi128-apps-ksirk.png hi16-apps-ksirk.png hi22-apps-ksirk.png hi32-apps-ksirk.png hi48-apps-ksirk.png hi64-apps-ksirk.png lo16-apps-ksirk.png lo32-apps-ksirk.png DESTINATION ${KDE_INSTALL_ICONDIR} )
-install( FILES ksirksettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
-install( PROGRAMS org.kde.ksirk.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES ksirkui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/ksirk )
-install( FILES jabber.png DESTINATION ${DATA_INSTALL_DIR}/ksirk )
-install( FILES ksirk.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
+install( FILES ksirksettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )
+install( PROGRAMS org.kde.ksirk.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
+install( FILES ksirkui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/ksirk )
+install( FILES jabber.png DESTINATION ${KDE_INSTALL_DATADIR}/ksirk )
+install( FILES ksirk.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} )
diff --git a/ksirk/iris/src/CMakeLists.txt b/ksirk/iris/src/CMakeLists.txt
index 35da74f..da2a0ff 100644
--- a/ksirk/iris/src/CMakeLists.txt
+++ b/ksirk/iris/src/CMakeLists.txt
@@ -151,6 +151,6 @@ set_target_properties(iris_ksirk PROPERTIES
SOVERSION 2
COMPILE_FLAGS -DIRISNET_STATIC
)
-install(TARGETS iris_ksirk ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS iris_ksirk ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/ksirk/skins/CMakeLists.txt b/ksirk/skins/CMakeLists.txt
index c0bd91d..0d60ab1 100644
--- a/ksirk/skins/CMakeLists.txt
+++ b/ksirk/skins/CMakeLists.txt
@@ -2,4 +2,4 @@ add_subdirectory( default )
# add_subdirectory( static )
# add_subdirectory( realpol )
-install(FILES skinsdir DESTINATION ${DATA_INSTALL_DIR}/ksirk/skins )
+install(FILES skinsdir DESTINATION ${KDE_INSTALL_DATADIR}/ksirk/skins )
diff --git a/ksirk/skins/default/Data/CMakeLists.txt b/ksirk/skins/default/Data/CMakeLists.txt
index 7960c97..ea98802 100644
--- a/ksirk/skins/default/Data/CMakeLists.txt
+++ b/ksirk/skins/default/Data/CMakeLists.txt
@@ -1,3 +1,3 @@
-install(FILES world.desktop DESTINATION ${DATA_INSTALL_DIR}/ksirk/skins/default/Data )
+install(FILES world.desktop DESTINATION ${KDE_INSTALL_DATADIR}/ksirk/skins/default/Data )
diff --git a/ksirk/skins/default/Images/CMakeLists.txt b/ksirk/skins/default/Images/CMakeLists.txt
index 5189a41..a1a7b81 100644
--- a/ksirk/skins/default/Images/CMakeLists.txt
+++ b/ksirk/skins/default/Images/CMakeLists.txt
@@ -32,4 +32,4 @@ soldierKneeling.png
stopAttackAuto.png
upArrow.png
)
-install( FILES ${pics_default_DATA} DESTINATION ${DATA_INSTALL_DIR}/ksirk/skins/default/Images/ )
+install( FILES ${pics_default_DATA} DESTINATION ${KDE_INSTALL_DATADIR}/ksirk/skins/default/Images/ )
diff --git a/ksirk/skins/default/Images/work/sprites/CMakeLists.txt b/ksirk/skins/default/Images/work/sprites/CMakeLists.txt
index 4733e7e..a074db1 100644
--- a/ksirk/skins/default/Images/work/sprites/CMakeLists.txt
+++ b/ksirk/skins/default/Images/work/sprites/CMakeLists.txt
@@ -14,5 +14,5 @@ japan.svg
uk.svg
us.svg)
-install( FILES ${sprites_default_DATA} DESTINATION ${DATA_INSTALL_DIR}/ksirk/skins/default/Images/sprites )
+install( FILES ${sprites_default_DATA} DESTINATION ${KDE_INSTALL_DATADIR}/ksirk/skins/default/Images/sprites )
diff --git a/ksirk/skins/default/Sounds/CMakeLists.txt b/ksirk/skins/default/Sounds/CMakeLists.txt
index 4f15af1..0e482fc 100644
--- a/ksirk/skins/default/Sounds/CMakeLists.txt
+++ b/ksirk/skins/default/Sounds/CMakeLists.txt
@@ -4,6 +4,6 @@ cannon.wav
crash.wav
roll.wav)
-install(FILES ${sounds_default_DATA} DESTINATION ${DATA_INSTALL_DIR}/ksirk/skins/default/Sounds)
+install(FILES ${sounds_default_DATA} DESTINATION ${KDE_INSTALL_DATADIR}/ksirk/skins/default/Sounds)
diff --git a/ksirk/skins/legacy/Data/CMakeLists.txt b/ksirk/skins/legacy/Data/CMakeLists.txt
index 7960c97..ea98802 100644
--- a/ksirk/skins/legacy/Data/CMakeLists.txt
+++ b/ksirk/skins/legacy/Data/CMakeLists.txt
@@ -1,3 +1,3 @@
-install(FILES world.desktop DESTINATION ${DATA_INSTALL_DIR}/ksirk/skins/default/Data )
+install(FILES world.desktop DESTINATION ${KDE_INSTALL_DATADIR}/ksirk/skins/default/Data )
diff --git a/ksirk/skins/legacy/Images/CMakeLists.txt b/ksirk/skins/legacy/Images/CMakeLists.txt
index 5189a41..a1a7b81 100644
--- a/ksirk/skins/legacy/Images/CMakeLists.txt
+++ b/ksirk/skins/legacy/Images/CMakeLists.txt
@@ -32,4 +32,4 @@ soldierKneeling.png
stopAttackAuto.png
upArrow.png
)
-install( FILES ${pics_default_DATA} DESTINATION ${DATA_INSTALL_DIR}/ksirk/skins/default/Images/ )
+install( FILES ${pics_default_DATA} DESTINATION ${KDE_INSTALL_DATADIR}/ksirk/skins/default/Images/ )
diff --git a/ksirk/skins/legacy/Images/work/sprites/CMakeLists.txt b/ksirk/skins/legacy/Images/work/sprites/CMakeLists.txt
index 4733e7e..a074db1 100644
--- a/ksirk/skins/legacy/Images/work/sprites/CMakeLists.txt
+++ b/ksirk/skins/legacy/Images/work/sprites/CMakeLists.txt
@@ -14,5 +14,5 @@ japan.svg
uk.svg
us.svg)
-install( FILES ${sprites_default_DATA} DESTINATION ${DATA_INSTALL_DIR}/ksirk/skins/default/Images/sprites )
+install( FILES ${sprites_default_DATA} DESTINATION ${KDE_INSTALL_DATADIR}/ksirk/skins/default/Images/sprites )
diff --git a/ksirk/skins/legacy/Sounds/CMakeLists.txt b/ksirk/skins/legacy/Sounds/CMakeLists.txt
index 4f15af1..0e482fc 100644
--- a/ksirk/skins/legacy/Sounds/CMakeLists.txt
+++ b/ksirk/skins/legacy/Sounds/CMakeLists.txt
@@ -4,6 +4,6 @@ cannon.wav
crash.wav
roll.wav)
-install(FILES ${sounds_default_DATA} DESTINATION ${DATA_INSTALL_DIR}/ksirk/skins/default/Sounds)
+install(FILES ${sounds_default_DATA} DESTINATION ${KDE_INSTALL_DATADIR}/ksirk/skins/default/Sounds)
diff --git a/ksirk/skins/realpol/Data/CMakeLists.txt b/ksirk/skins/realpol/Data/CMakeLists.txt
index 74e8038..ab16aae 100644
--- a/ksirk/skins/realpol/Data/CMakeLists.txt
+++ b/ksirk/skins/realpol/Data/CMakeLists.txt
@@ -1,3 +1,3 @@
-install(FILES onu.xml DESTINATION ${DATA_INSTALL_DIR}/ksirk/skins/realpol/Data )
+install(FILES onu.xml DESTINATION ${KDE_INSTALL_DATADIR}/ksirk/skins/realpol/Data )
diff --git a/ksirk/skins/realpol/Images/CMakeLists.txt b/ksirk/skins/realpol/Images/CMakeLists.txt
index ba763ea..1a7bc7f 100644
--- a/ksirk/skins/realpol/Images/CMakeLists.txt
+++ b/ksirk/skins/realpol/Images/CMakeLists.txt
@@ -95,7 +95,7 @@ downArrow.png
upArrow.png
2UpArrow.png
)
-install( FILES ${pics_default_DATA} DESTINATION ${DATA_INSTALL_DIR}/ksirk/skins/realpol/Images/ )
+install( FILES ${pics_default_DATA} DESTINATION ${KDE_INSTALL_DATADIR}/ksirk/skins/realpol/Images/ )
# Images/countries/vietnam.png
# Images/countries/japan.png
diff --git a/ksirk/skins/realpol/Images/sprites/CMakeLists.txt b/ksirk/skins/realpol/Images/sprites/CMakeLists.txt
index 9a9a96c..306ce78 100644
--- a/ksirk/skins/realpol/Images/sprites/CMakeLists.txt
+++ b/ksirk/skins/realpol/Images/sprites/CMakeLists.txt
@@ -14,5 +14,5 @@ infantry3.svg
uk.svg
us.svg)
-install( FILES ${sprites_default_DATA} DESTINATION ${DATA_INSTALL_DIR}/ksirk/skins/realpol/Images/sprites )
+install( FILES ${sprites_default_DATA} DESTINATION ${KDE_INSTALL_DATADIR}/ksirk/skins/realpol/Images/sprites )
diff --git a/ksirk/skins/realpol/Sounds/CMakeLists.txt b/ksirk/skins/realpol/Sounds/CMakeLists.txt
index f3cd52e..99d532b 100644
--- a/ksirk/skins/realpol/Sounds/CMakeLists.txt
+++ b/ksirk/skins/realpol/Sounds/CMakeLists.txt
@@ -4,6 +4,6 @@ canon.wav
crash.wav
roule.wav)
-install(FILES ${sounds_default_DATA} DESTINATION ${DATA_INSTALL_DIR}/ksirk/skins/realpol/Sounds)
+install(FILES ${sounds_default_DATA} DESTINATION ${KDE_INSTALL_DATADIR}/ksirk/skins/realpol/Sounds)
diff --git a/ksirk/skins/static/Data/CMakeLists.txt b/ksirk/skins/static/Data/CMakeLists.txt
index 57cde06..b6fcd1f 100644
--- a/ksirk/skins/static/Data/CMakeLists.txt
+++ b/ksirk/skins/static/Data/CMakeLists.txt
@@ -1,3 +1,3 @@
-install(FILES world.desktop DESTINATION ${DATA_INSTALL_DIR}/ksirk/skins/static/Data )
+install(FILES world.desktop DESTINATION ${KDE_INSTALL_DATADIR}/ksirk/skins/static/Data )
diff --git a/ksirk/skins/static/Images/CMakeLists.txt b/ksirk/skins/static/Images/CMakeLists.txt
index 73fa58d..0ae9d95 100644
--- a/ksirk/skins/static/Images/CMakeLists.txt
+++ b/ksirk/skins/static/Images/CMakeLists.txt
@@ -32,4 +32,4 @@ soldierKneeling.png
stopAttackAuto.png
upArrow.png
)
-install( FILES ${pics_default_DATA} DESTINATION ${DATA_INSTALL_DIR}/ksirk/skins/static/Images/ )
+install( FILES ${pics_default_DATA} DESTINATION ${KDE_INSTALL_DATADIR}/ksirk/skins/static/Images/ )
diff --git a/ksirk/skins/static/Sounds/CMakeLists.txt b/ksirk/skins/static/Sounds/CMakeLists.txt
index 3ece400..eef8de5 100644
--- a/ksirk/skins/static/Sounds/CMakeLists.txt
+++ b/ksirk/skins/static/Sounds/CMakeLists.txt
@@ -4,6 +4,6 @@ cannon.wav
crash.wav
roll.wav)
-install(FILES ${sounds_default_DATA} DESTINATION ${DATA_INSTALL_DIR}/ksirk/skins/static/Sounds)
+install(FILES ${sounds_default_DATA} DESTINATION ${KDE_INSTALL_DATADIR}/ksirk/skins/static/Sounds)
diff --git a/ksirkskineditor/CMakeLists.txt b/ksirkskineditor/CMakeLists.txt
index e4431de..88eeef3 100644
--- a/ksirkskineditor/CMakeLists.txt
+++ b/ksirkskineditor/CMakeLists.txt
@@ -58,18 +58,18 @@ target_link_libraries(ksirkskineditor
${CRYPT_LIBS}
)
-install( TARGETS ksirkskineditor ${INSTALL_TARGETS_DEFAULT_ARGS})
+install( TARGETS ksirkskineditor ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
-ecm_install_icons( ${ICON_INSTALL_DIR} )
+ecm_install_icons( ${KDE_INSTALL_ICONDIR} )
-install( FILES ksirkskineditorsettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
-install( PROGRAMS org.kde.ksirkskineditor.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES ksirkskineditorui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/ksirkskineditor )
+install( FILES ksirkskineditorsettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )
+install( PROGRAMS org.kde.ksirkskineditor.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
+install( FILES ksirkskineditorui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/ksirkskineditor )
set (pics_default_DATA
cross.png
target.png
)
-install( FILES ${pics_default_DATA} DESTINATION ${DATA_INSTALL_DIR}/ksirkskineditor/ )
+install( FILES ${pics_default_DATA} DESTINATION ${KDE_INSTALL_DATADIR}/ksirkskineditor/ )