summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-03-03 13:35:17 +0100
committerMontel Laurent <[email protected]>2015-03-03 13:35:17 +0100
commit7a8f1e3ffccec29fcfb1a86e5c6c8876bcd7f0b8 (patch)
treef508c520e5416fb2bae9fcef35436f92084c713b
parent2aaf352bd546694f1471aec002ecefa9fff17299 (diff)
Use new macro for use icon on Win/MacOsX. Use new KDE_ macro.
-rw-r--r--CMakeLists.txt14
-rw-r--r--doc/CMakeLists.txt2
-rw-r--r--icons/CMakeLists.txt2
-rw-r--r--rulesets/CMakeLists.txt2
-rw-r--r--themes/CMakeLists.txt2
5 files changed, 12 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ea704f..4676bfa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project( killbots )
cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
set (QT_MIN_VERSION "5.3.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 Test)
@@ -26,6 +26,7 @@ find_package(KF5 REQUIRED COMPONENTS
find_package(KF5KDEGames 4.9.0 REQUIRED)
include(FeatureSummary)
+include(ECMAddAppIcon)
include(ECMInstallIcons)
include(KDEInstallDirs)
include(KDECompilerSettings)
@@ -59,14 +60,15 @@ set( killbots_SRCS
view.cpp
)
kconfig_add_kcfg_files( killbots_SRCS settings.kcfgc rulesetbase.kcfgc )
-#kde4_add_app_icon( killbots_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-killbots.png")
+file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-killbots.png")
+ecm_add_app_icon( killbots_SRCS ICONS ${ICONS_SRCS})
add_executable( killbots ${killbots_SRCS} )
target_link_libraries( killbots KF5KDEGames Qt5::Xml KF5::XmlGui Qt5::Widgets KF5::DBusAddons KF5::Completion KF5::I18n)
###### Installing Files ######
-install( TARGETS killbots ${INSTALL_TARGETS_DEFAULT_ARGS} )
-install( PROGRAMS org.kde.killbots.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES killbotsui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/killbots )
-install( FILES killbots.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
+install( TARGETS killbots ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
+install( PROGRAMS org.kde.killbots.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
+install( FILES killbotsui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/killbots )
+install( FILES killbots.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index b94b9ef..4acf8a0 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1 +1 @@
-kdoctools_create_handbook( index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR killbots )
+kdoctools_create_handbook( index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR killbots )
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index a5d2267..590cc74 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1,2 +1,2 @@
###### Installing Icons ######
-ecm_install_icons(ICONS hi128-apps-killbots.png hi16-apps-killbots.png hi22-apps-killbots.png hi32-apps-killbots.png hi48-apps-killbots.png hi64-apps-killbots.png DESTINATION ${ICON_INSTALL_DIR} )
+ecm_install_icons(ICONS hi128-apps-killbots.png hi16-apps-killbots.png hi22-apps-killbots.png hi32-apps-killbots.png hi48-apps-killbots.png hi64-apps-killbots.png DESTINATION ${KDE_INSTALL_ICONDIR} )
diff --git a/rulesets/CMakeLists.txt b/rulesets/CMakeLists.txt
index d55b7d9..7a0ca27 100644
--- a/rulesets/CMakeLists.txt
+++ b/rulesets/CMakeLists.txt
@@ -7,4 +7,4 @@ set( ruleset_files
energycrisis.desktop
)
-install( FILES ${ruleset_files} DESTINATION ${DATA_INSTALL_DIR}/killbots/rulesets )
+install( FILES ${ruleset_files} DESTINATION ${KDE_INSTALL_DATADIR}/killbots/rulesets )
diff --git a/themes/CMakeLists.txt b/themes/CMakeLists.txt
index e520151..eada544 100644
--- a/themes/CMakeLists.txt
+++ b/themes/CMakeLists.txt
@@ -14,4 +14,4 @@ set( theme_files
robotkill.svgz
)
-install( FILES ${theme_files} DESTINATION ${DATA_INSTALL_DIR}/killbots/themes )
+install( FILES ${theme_files} DESTINATION ${KDE_INSTALL_DATADIR}/killbots/themes )