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

CMakeLists.txt

@@ -3,7 +3,7 @@ project(kgoldrunner)
 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 Qml Quick QuickWidgets Svg Test)
@@ -34,6 +34,7 @@ include(ECMInstallIcons)
 include(KDEInstallDirs)
 include(KDECompilerSettings)
 include(KDECMakeSettings)
+include(ECMAddAppIcon)
 
 add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 add_definitions(-DTRANSLATION_DOMAIN="kgoldrunner")

doc/CMakeLists.txt

 ########### install files ###############
 #
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kgoldrunner)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kgoldrunner)

gamedata/CMakeLists.txt

@@ -26,5 +26,5 @@ install( FILES game_CM.txt
                rec_demo.txt
                rec_GMGR.txt
 	       rec_GRII.txt
-   DESTINATION ${DATA_INSTALL_DIR}/kgoldrunner/system )
+   DESTINATION ${KDE_INSTALL_DATADIR}/kgoldrunner/system )
 

src/CMakeLists.txt

@@ -22,16 +22,17 @@ set(kgoldrunner_SRCS
    kgrsounds.cpp 
    kgrdialog.cpp )
 
-kde4_add_app_icon(kgoldrunner_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-apps-kgoldrunner.png")
+file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-apps-kgoldrunner.png")
+ecm_add_app_icon(kgoldrunner_SRCS ICONS ${ICONS_SRCS})
 add_executable(kgoldrunner ${kgoldrunner_SRCS})
 
 target_link_libraries(kgoldrunner  KF5KDEGames KF5KDEGamesPrivate KF5::KDELibs4Support KF5::DBusAddons)
 
-install(TARGETS kgoldrunner  ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kgoldrunner  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
 
 ########### install files ###############
 
-install( PROGRAMS org.kde.KGoldrunner.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
-install( FILES kgoldrunnerui.rc  DESTINATION  ${KXMLGUI_INSTALL_DIR}/kgoldrunner )
+install( PROGRAMS org.kde.KGoldrunner.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )
+install( FILES kgoldrunnerui.rc  DESTINATION  ${KDE_INSTALL_KXMLGUI5DIR}/kgoldrunner )
 
-ecm_install_icons( ICONS hi128-apps-kgoldrunner.png  hi16-apps-kgoldrunner.png  hi22-apps-kgoldrunner.png  hi32-apps-kgoldrunner.png  hi48-apps-kgoldrunner.png  hi64-apps-kgoldrunner.png DESTINATION ${ICON_INSTALL_DIR} )
+ecm_install_icons( ICONS hi128-apps-kgoldrunner.png  hi16-apps-kgoldrunner.png  hi22-apps-kgoldrunner.png  hi32-apps-kgoldrunner.png  hi48-apps-kgoldrunner.png  hi64-apps-kgoldrunner.png DESTINATION ${KDE_INSTALL_ICONDIR} )

themes/CMakeLists.txt

@@ -11,7 +11,7 @@ install( FILES README
                kgr_geek.desktop
                nostalgia.desktop
                nostalgia-blues.desktop
-               DESTINATION ${DATA_INSTALL_DIR}/kgoldrunner/themes )
+               DESTINATION ${KDE_INSTALL_DATADIR}/kgoldrunner/themes )
 
 install( FILES 
 	default/set.svg default/actors.svg
@@ -20,26 +20,26 @@ install( FILES
  	default/dig.ogg default/ladder.ogg default/completed.ogg
  	default/death.ogg default/gameover.ogg default/victory.ogg
 	DESTINATION 
-	${DATA_INSTALL_DIR}/kgoldrunner/themes/default )
+	${KDE_INSTALL_DATADIR}/kgoldrunner/themes/default )
 
 install( FILES accessible/black-on-white-set.svg
                accessible/black-on-white-actors.svg
                accessible/black-on-white.png
-               DESTINATION ${DATA_INSTALL_DIR}/kgoldrunner/themes/accessible )
+               DESTINATION ${KDE_INSTALL_DATADIR}/kgoldrunner/themes/accessible )
 
 install( FILES kgr_geek/set.svgz kgr_geek/actors.svgz
                kgr_geek/kgr_geek.png
-               DESTINATION ${DATA_INSTALL_DIR}/kgoldrunner/themes/kgr_geek )
+               DESTINATION ${KDE_INSTALL_DATADIR}/kgoldrunner/themes/kgr_geek )
 
 install( FILES nostalgia/blue-set.svg nostalgia/blue-actors.svg 
                nostalgia/set.svg nostalgia/actors.svg
                nostalgia/nostalgia.png
                nostalgia/nostalgia-blues.png
-               DESTINATION ${DATA_INSTALL_DIR}/kgoldrunner/themes/nostalgia )
+               DESTINATION ${KDE_INSTALL_DATADIR}/kgoldrunner/themes/nostalgia )
 
 install( FILES egypt/egypt_kgr.svgz egypt/actors.svgz
                egypt/egypt.png
-               DESTINATION ${DATA_INSTALL_DIR}/kgoldrunner/themes/egypt )
+               DESTINATION ${KDE_INSTALL_DATADIR}/kgoldrunner/themes/egypt )
 
-install( FILES kgoldrunner.knsrc  DESTINATION  ${CONFIG_INSTALL_DIR} )
+install( FILES kgoldrunner.knsrc  DESTINATION  ${KDE_INSTALL_CONFDIR} )