Use new macro for use icon on Win/MacOsX. Use new KDE_ macro.

This commit is contained in:
Montel Laurent 2015-03-03 13:35:36 +01:00
parent 8646e0c004
commit 2c12505341
7 changed files with 14 additions and 14 deletions

View file

@ -3,7 +3,7 @@ project(kigo)
cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
set (QT_MIN_VERSION "5.3.0") 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}) 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) 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) find_package(Phonon4Qt5 CONFIG REQUIRED)
include(FeatureSummary) include(FeatureSummary)
include(ECMAddAppIcon)
include(ECMInstallIcons) include(ECMInstallIcons)
include(KDEInstallDirs) include(KDEInstallDirs)
include(KDECompilerSettings) include(KDECompilerSettings)
include(KDECMakeSettings) include(KDECMakeSettings)
add_definitions(${QT_DEFINITIONS})
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
add_definitions(-DTRANSLATION_DOMAIN="kigo") add_definitions(-DTRANSLATION_DOMAIN="kigo")

View file

@ -1,4 +1,4 @@
install(FILES install(FILES
Honinbo-51-5.sgf Honinbo-51-5.sgf
Mehin-21-2.sgf Mehin-21-2.sgf
DESTINATION ${DATA_INSTALL_DIR}/kigo/games) DESTINATION ${KDE_INSTALL_DATADIR}/kigo/games)

View file

@ -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})

View file

@ -1,2 +1,2 @@
#install(FILES kigo.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kigo) #install(FILES kigo.notifyrc DESTINATION ${KDE_INSTALL_DATADIR}/kigo)
#install(FILES kigo-click.wav kigo-won.wav DESTINATION ${DATA_INSTALL_DIR}/kigo/sounds) #install(FILES kigo-click.wav kigo-won.wav DESTINATION ${KDE_INSTALL_DATADIR}/kigo/sounds)

View file

@ -1,4 +1,4 @@
install(FILES install(FILES
default.desktop kigo_default.svgz kigo_default.png default.desktop kigo_default.svgz kigo_default.png
plain.desktop kigo_plain.svgz kigo_plain.png plain.desktop kigo_plain.svgz kigo_plain.png
DESTINATION ${DATA_INSTALL_DIR}/kigo/themes) DESTINATION ${KDE_INSTALL_DATADIR}/kigo/themes)

View file

@ -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)

View file

@ -37,9 +37,9 @@ target_link_libraries(kigo
Qt5::Svg Qt5::Svg
) )
install(TARGETS kigo ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS kigo ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES kigo.kcfg DESTINATION ${KCFG_INSTALL_DIR}) install(FILES kigo.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
install(FILES kigo.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) install(FILES kigo.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
install(FILES kigo-games.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) install(FILES kigo-games.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
install(PROGRAMS gui/org.kde.kigo.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(PROGRAMS gui/org.kde.kigo.desktop DESTINATION ${KDE_INSTALL_APPDIR})
install(FILES gui/kigoui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kigo) install(FILES gui/kigoui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kigo)