From 2c1250534151bffa4a42d985879bf9b9ff5dcec1 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Tue, 3 Mar 2015 13:35:36 +0100 Subject: [PATCH] Use new macro for use icon on Win/MacOsX. Use new KDE_ macro. --- CMakeLists.txt | 4 ++-- data/games/CMakeLists.txt | 2 +- data/icons/CMakeLists.txt | 2 +- data/sounds/CMakeLists.txt | 4 ++-- data/themes/CMakeLists.txt | 2 +- doc/CMakeLists.txt | 2 +- src/CMakeLists.txt | 12 ++++++------ 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ca2848..dfa7c5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(kigo) 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 Svg) @@ -25,12 +25,12 @@ find_package(KF5KDEGames 4.9.0 REQUIRED) find_package(Phonon4Qt5 CONFIG REQUIRED) include(FeatureSummary) +include(ECMAddAppIcon) include(ECMInstallIcons) include(KDEInstallDirs) include(KDECompilerSettings) include(KDECMakeSettings) -add_definitions(${QT_DEFINITIONS}) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) add_definitions(-DTRANSLATION_DOMAIN="kigo") diff --git a/data/games/CMakeLists.txt b/data/games/CMakeLists.txt index 0dd89a0..7827751 100644 --- a/data/games/CMakeLists.txt +++ b/data/games/CMakeLists.txt @@ -1,4 +1,4 @@ install(FILES Honinbo-51-5.sgf Mehin-21-2.sgf -DESTINATION ${DATA_INSTALL_DIR}/kigo/games) +DESTINATION ${KDE_INSTALL_DATADIR}/kigo/games) diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt index b5448ad..0601148 100644 --- a/data/icons/CMakeLists.txt +++ b/data/icons/CMakeLists.txt @@ -1 +1 @@ -ecm_install_icons(ICONS hi128-apps-kigo.png hi16-apps-kigo.png hi22-apps-kigo.png hi32-apps-kigo.png hi48-apps-kigo.png hi64-apps-kigo.png DESTINATION ${ICON_INSTALL_DIR}) +ecm_install_icons(ICONS hi128-apps-kigo.png hi16-apps-kigo.png hi22-apps-kigo.png hi32-apps-kigo.png hi48-apps-kigo.png hi64-apps-kigo.png DESTINATION ${KDE_INSTALL_ICONDIR}) diff --git a/data/sounds/CMakeLists.txt b/data/sounds/CMakeLists.txt index fa46c94..5093f12 100644 --- a/data/sounds/CMakeLists.txt +++ b/data/sounds/CMakeLists.txt @@ -1,2 +1,2 @@ -#install(FILES kigo.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kigo) -#install(FILES kigo-click.wav kigo-won.wav DESTINATION ${DATA_INSTALL_DIR}/kigo/sounds) +#install(FILES kigo.notifyrc DESTINATION ${KDE_INSTALL_DATADIR}/kigo) +#install(FILES kigo-click.wav kigo-won.wav DESTINATION ${KDE_INSTALL_DATADIR}/kigo/sounds) diff --git a/data/themes/CMakeLists.txt b/data/themes/CMakeLists.txt index 38e189b..ede599c 100644 --- a/data/themes/CMakeLists.txt +++ b/data/themes/CMakeLists.txt @@ -1,4 +1,4 @@ install(FILES default.desktop kigo_default.svgz kigo_default.png plain.desktop kigo_plain.svgz kigo_plain.png -DESTINATION ${DATA_INSTALL_DIR}/kigo/themes) +DESTINATION ${KDE_INSTALL_DATADIR}/kigo/themes) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 80b1844..92a1abb 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1 +1 @@ -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kigo) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kigo) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8d525bf..03d8892 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,9 +37,9 @@ target_link_libraries(kigo Qt5::Svg ) -install(TARGETS kigo ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES kigo.kcfg DESTINATION ${KCFG_INSTALL_DIR}) -install(FILES kigo.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) -install(FILES kigo-games.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) -install(PROGRAMS gui/org.kde.kigo.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install(FILES gui/kigoui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kigo) +install(TARGETS kigo ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) +install(FILES kigo.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR}) +install(FILES kigo.knsrc DESTINATION ${KDE_INSTALL_CONFDIR}) +install(FILES kigo-games.knsrc DESTINATION ${KDE_INSTALL_CONFDIR}) +install(PROGRAMS gui/org.kde.kigo.desktop DESTINATION ${KDE_INSTALL_APPDIR}) +install(FILES gui/kigoui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kigo)