summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-03-15 07:54:13 +0100
committerMontel Laurent <[email protected]>2015-03-15 07:54:13 +0100
commitdc463545f281b8604da7b6ea13072b905e4ef8d5 (patch)
treee5bc8e80efa364e0e98352e4ab998d090fbfb6f9
parent922416ad3fe1dc202b209733e709652fe27d727c (diff)
Rename icons
-rw-r--r--128-apps-kfourinline.png (renamed from hi128-apps-kfourinline.png)bin9055 -> 9055 bytes
-rw-r--r--16-apps-kfourinline.png (renamed from hi16-apps-kfourinline.png)bin867 -> 867 bytes
-rw-r--r--22-apps-kfourinline.png (renamed from hi22-apps-kfourinline.png)bin1272 -> 1272 bytes
-rw-r--r--32-apps-kfourinline.png (renamed from hi32-apps-kfourinline.png)bin1985 -> 1985 bytes
-rw-r--r--48-apps-kfourinline.png (renamed from hi48-apps-kfourinline.png)bin3402 -> 3402 bytes
-rw-r--r--64-apps-kfourinline.png (renamed from hi64-apps-kfourinline.png)bin3942 -> 3942 bytes
-rw-r--r--CMakeLists.txt8
-rw-r--r--doc/CMakeLists.txt2
-rw-r--r--grafix/CMakeLists.txt2
-rw-r--r--src/CMakeLists.txt12
10 files changed, 14 insertions, 10 deletions
diff --git a/hi128-apps-kfourinline.png b/128-apps-kfourinline.png
index bf7259a..bf7259a 100644
--- a/hi128-apps-kfourinline.png
+++ b/128-apps-kfourinline.png
Binary files differ
diff --git a/hi16-apps-kfourinline.png b/16-apps-kfourinline.png
index 81481ac..81481ac 100644
--- a/hi16-apps-kfourinline.png
+++ b/16-apps-kfourinline.png
Binary files differ
diff --git a/hi22-apps-kfourinline.png b/22-apps-kfourinline.png
index a960e45..a960e45 100644
--- a/hi22-apps-kfourinline.png
+++ b/22-apps-kfourinline.png
Binary files differ
diff --git a/hi32-apps-kfourinline.png b/32-apps-kfourinline.png
index 35335c8..35335c8 100644
--- a/hi32-apps-kfourinline.png
+++ b/32-apps-kfourinline.png
Binary files differ
diff --git a/hi48-apps-kfourinline.png b/48-apps-kfourinline.png
index e311b68..e311b68 100644
--- a/hi48-apps-kfourinline.png
+++ b/48-apps-kfourinline.png
Binary files differ
diff --git a/hi64-apps-kfourinline.png b/64-apps-kfourinline.png
index e6dd967..e6dd967 100644
--- a/hi64-apps-kfourinline.png
+++ b/64-apps-kfourinline.png
Binary files differ
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06fb9de..e42067a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(kfourinline)
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)
@@ -31,6 +31,8 @@ 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="kfourinline")
@@ -43,9 +45,9 @@ add_subdirectory( doc )
########### install files ###############
-install( PROGRAMS org.kde.kfourinline.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( PROGRAMS org.kde.kfourinline.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
-ecm_install_icons( ICONS hi128-apps-kfourinline.png hi16-apps-kfourinline.png hi22-apps-kfourinline.png hi32-apps-kfourinline.png hi48-apps-kfourinline.png hi64-apps-kfourinline.png DESTINATION ${ICON_INSTALL_DIR} )
+ecm_install_icons( ICONS 128-apps-kfourinline.png 16-apps-kfourinline.png 22-apps-kfourinline.png 32-apps-kfourinline.png 48-apps-kfourinline.png 64-apps-kfourinline.png DESTINATION ${KDE_INSTALL_ICONDIR} )
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 63e700f..c65b0c5 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 kfourinline)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kfourinline)
diff --git a/grafix/CMakeLists.txt b/grafix/CMakeLists.txt
index 653743c..62ad70b 100644
--- a/grafix/CMakeLists.txt
+++ b/grafix/CMakeLists.txt
@@ -13,5 +13,5 @@ gray_reflection.rc
gray_reflection.svg
yellow_reflection.desktop
yellow_reflection.rc
-DESTINATION ${DATA_INSTALL_DIR}/kfourinline/grafix)
+DESTINATION ${KDE_INSTALL_DATADIR}/kfourinline/grafix)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bf1d82e..a7eae40 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,7 +34,9 @@ ki18n_wrap_ui(kwin4_SRCS settings.ui statuswidget.ui statistics.ui )
kconfig_add_kcfg_files(kwin4_SRCS prefs.kcfgc )
-kde4_add_app_icon(kwin4_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../hi*-app-kfourinline.png")
+file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../*-apps-k*.png")
+ecm_add_app_icon(kblocks_SRCS ICONS ${ICONS_SRCS})
+
add_executable(kfourinline ${kwin4_SRCS})
target_link_libraries(kfourinline
@@ -45,7 +47,7 @@ target_link_libraries(kfourinline
KF5KDEGamesPrivate
Qt5::Svg)
-install(TARGETS kfourinline ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kfourinline ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
########### next target ###############
@@ -59,12 +61,12 @@ add_executable(kfourinlineproc ${kwin4proc_SRCS})
target_link_libraries(kfourinlineproc KF5::KDELibs4Support KF5KDEGames KF5KDEGamesPrivate Qt5::Svg)
-install(TARGETS kfourinlineproc ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kfourinlineproc ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
########### install files ###############
-install( FILES kwin4.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
-install( FILES kfourinlineui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kfourinline )
+install( FILES kwin4.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )
+install( FILES kfourinlineui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kfourinline )