summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-03-03 13:36:58 +0100
committerMontel Laurent <[email protected]>2015-03-03 13:36:58 +0100
commit10578d470f907febcffaa935b6429cda96e830c8 (patch)
tree88c117a3200ca7faa67997ff8d5254b05700c2b9
parent04812eed94439ea7b4059812a5114c0a3eccc5ac (diff)
Use new macro for use icon on Win/MacOsX. Use new KDE_ macro.
-rw-r--r--CMakeLists.txt5
-rw-r--r--doc/CMakeLists.txt2
-rw-r--r--levelsets/CMakeLists.txt2
-rw-r--r--pics/CMakeLists.txt2
-rw-r--r--src/CMakeLists.txt9
-rw-r--r--themes/CMakeLists.txt2
6 files changed, 12 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0934534..7b65dc7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project( kbreakout )
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)
@@ -30,6 +30,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="kbreakout")
@@ -40,5 +41,5 @@ add_subdirectory( pics )
add_subdirectory( themes )
add_subdirectory( levelsets )
add_subdirectory(doc)
-install( PROGRAMS org.kde.kbreakout.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( PROGRAMS org.kde.kbreakout.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index bb2b3a4..c1fac3e 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
########### install files ###############
#
#
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kbreakout)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kbreakout)
diff --git a/levelsets/CMakeLists.txt b/levelsets/CMakeLists.txt
index ea5a3a1..3deceb9 100644
--- a/levelsets/CMakeLists.txt
+++ b/levelsets/CMakeLists.txt
@@ -1 +1 @@
-install( FILES default.levelset DESTINATION ${DATA_INSTALL_DIR}/kbreakout/levelsets ) \ No newline at end of file
+install( FILES default.levelset DESTINATION ${KDE_INSTALL_DATADIR}/kbreakout/levelsets ) \ No newline at end of file
diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
index 01655fb..56218a1 100644
--- a/pics/CMakeLists.txt
+++ b/pics/CMakeLists.txt
@@ -1 +1 @@
-ecm_install_icons( ICONS hi128-apps-kbreakout.png hi16-apps-kbreakout.png hi22-apps-kbreakout.png hi32-apps-kbreakout.png hi48-apps-kbreakout.png hi64-apps-kbreakout.png DESTINATION ${ICON_INSTALL_DIR} )
+ecm_install_icons( ICONS hi128-apps-kbreakout.png hi16-apps-kbreakout.png hi22-apps-kbreakout.png hi32-apps-kbreakout.png hi48-apps-kbreakout.png hi64-apps-kbreakout.png DESTINATION ${KDE_INSTALL_ICONDIR} )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2010b3f..b565560 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,12 +13,13 @@ ki18n_wrap_ui(kbreakout_SRCS generalsettings.ui)
kconfig_add_kcfg_files(kbreakout_SRCS settings.kcfgc )
-#kde4_add_app_icon(kbreakout_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pics/hi*-apps-kbreakout.png")
+file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pics/hi*-apps-kbreakout.png")
+ecm_add_app_icon(kbreakout_SRCS ICONS ${ICONS_SRCS})
add_executable(kbreakout ${kbreakout_SRCS})
target_link_libraries(kbreakout KF5KDEGames KF5KDEGamesPrivate Qt5::Xml KF5::DBusAddons KF5::XmlGui)
-install(TARGETS kbreakout ${INSTALL_TARGETS_DEFAULT_ARGS} )
-install(FILES kbreakoutui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kbreakout)
-install(DIRECTORY qml DESTINATION ${DATA_INSTALL_DIR}/kbreakout)
+install(TARGETS kbreakout ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
+install(FILES kbreakoutui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kbreakout)
+install(DIRECTORY qml DESTINATION ${KDE_INSTALL_DATADIR}/kbreakout)
diff --git a/themes/CMakeLists.txt b/themes/CMakeLists.txt
index c2a55e4..e1caa23 100644
--- a/themes/CMakeLists.txt
+++ b/themes/CMakeLists.txt
@@ -1 +1 @@
-install( FILES default.desktop egyptian_breakout_preview.png egyptianbreakout.svgz alienbreakout.svgz alienbreakout.desktop alien_preview.png web20.svgz web20.desktop web20_preview.png crystal.desktop crystal.svgz crystal_preview.png simple.svgz simple.desktop simple_preview.png IceWorld.svgz IceWorld.desktop IceWorld_preview.png DESTINATION ${DATA_INSTALL_DIR}/kbreakout/themes )
+install( FILES default.desktop egyptian_breakout_preview.png egyptianbreakout.svgz alienbreakout.svgz alienbreakout.desktop alien_preview.png web20.svgz web20.desktop web20_preview.png crystal.desktop crystal.svgz crystal_preview.png simple.svgz simple.desktop simple_preview.png IceWorld.svgz IceWorld.desktop IceWorld_preview.png DESTINATION ${KDE_INSTALL_DATADIR}/kbreakout/themes )