summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-03-03 13:39:15 +0100
committerMontel Laurent <[email protected]>2015-03-03 13:39:15 +0100
commit8b8ce6b4951bafd4e78633ec0b87527ff319b1ae (patch)
tree5bd6a3e8d9510739c9d3d77b07919794cacd44bf
parent0979ed735a5bdf630a8198978588baf170c08ab4 (diff)
Use new macro for use icon on Win/MacOsX. Use new KDE_ macro.
-rw-r--r--CMakeLists.txt3
-rw-r--r--doc/CMakeLists.txt2
-rw-r--r--pictures/CMakeLists.txt2
-rw-r--r--sounds/CMakeLists.txt2
-rw-r--r--src/CMakeLists.txt13
-rw-r--r--themes/CMakeLists.txt4
6 files changed, 14 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0f3749..a289ad5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(bomber)
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 )
@@ -27,6 +27,7 @@ include(ECMInstallIcons)
include(KDEInstallDirs)
include(KDECompilerSettings)
include(KDECMakeSettings)
+include(ECMAddAppIcon)
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index c0815a1..2ef3678 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 bomber)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR bomber)
diff --git a/pictures/CMakeLists.txt b/pictures/CMakeLists.txt
index 215e58f..c457e2e 100644
--- a/pictures/CMakeLists.txt
+++ b/pictures/CMakeLists.txt
@@ -1,2 +1,2 @@
-ecm_install_icons(ICONS hi128-apps-bomber.png hi32-apps-bomber.png hi48-apps-bomber.png hi64-apps-bomber.png DESTINATION ${ICON_INSTALL_DIR})
+ecm_install_icons(ICONS hi128-apps-bomber.png hi32-apps-bomber.png hi48-apps-bomber.png hi64-apps-bomber.png DESTINATION ${KDE_INSTALL_ICONDIR})
diff --git a/sounds/CMakeLists.txt b/sounds/CMakeLists.txt
index 7cdc9d6..1d0dda0 100644
--- a/sounds/CMakeLists.txt
+++ b/sounds/CMakeLists.txt
@@ -1,2 +1,2 @@
install(FILES
- DESTINATION ${DATA_INSTALL_DIR}/bomber/sounds)
+ DESTINATION ${KDE_INSTALL_DATADIR}/bomber/sounds)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e9440c4..cf58067 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,18 +12,19 @@ set(bomber_SRCS
)
kconfig_add_kcfg_files(bomber_SRCS settings.kcfgc )
-#kde4_add_app_icon(bomber_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pictures/hi*-apps-bomber.png")
+file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pictures/hi*-apps-bomber.png")
+ecm_add_app_icon(bomber_SRCS ICONS ${ICONS_SRCS})
add_executable(bomber ${bomber_SRCS})
target_link_libraries(bomber KF5KDEGames Phonon::phonon4qt5 KF5::XmlGui KF5::I18n KF5::DBusAddons)
-install(TARGETS bomber ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS bomber ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
########### install files ###############
-install( PROGRAMS org.kde.bomber.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES bomber.appdata.xml DESTINATION ${DATA_INSTALL_DIR}/appdata )
-install( FILES bomber.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
-install( FILES bomberui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/bomber )
+install( PROGRAMS org.kde.bomber.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
+install( FILES bomber.appdata.xml DESTINATION ${KDE_INSTALL_DATADIR}/appdata )
+install( FILES bomber.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )
+install( FILES bomberui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/bomber )
diff --git a/themes/CMakeLists.txt b/themes/CMakeLists.txt
index 83e79cf..2d37777 100644
--- a/themes/CMakeLists.txt
+++ b/themes/CMakeLists.txt
@@ -1,3 +1,3 @@
-install( FILES kbomber.desktop kbomber.png kbomber.svgz DESTINATION ${DATA_INSTALL_DIR}/bomber/themes )
-install( FILES Lava-Island.desktop lava-Island.png Lava-Island.svgz DESTINATION ${DATA_INSTALL_DIR}/bomber/themes ) \ No newline at end of file
+install( FILES kbomber.desktop kbomber.png kbomber.svgz DESTINATION ${KDE_INSTALL_DATADIR}/bomber/themes )
+install( FILES Lava-Island.desktop lava-Island.png Lava-Island.svgz DESTINATION ${KDE_INSTALL_DATADIR}/bomber/themes ) \ No newline at end of file