summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2015-03-01 09:57:10 (GMT)
committerMontel Laurent <montel@kde.org>2015-03-01 09:57:10 (GMT)
commit90b2f6c62c63799d7b21c9da748c07dbda1a2006 (patch)
treedff02501ee67a4a832a050f0e910d5d8e2299231
parent0b59e83530a6c8893a5d810ba8c3704627583615 (diff)
Fix install icons
-rw-r--r--CMakeLists.txt4
-rw-r--r--generators/spectre/CMakeLists.txt2
-rw-r--r--generators/spectre/hi16-apps-okular-gv.png (renamed from generators/spectre/hi16-app-okular-gv.png)bin160 -> 160 bytes
-rw-r--r--generators/spectre/hi32-app-okulars-gv.png (renamed from generators/spectre/hi32-app-okular-gv.png)bin259 -> 259 bytes
-rw-r--r--shell/CMakeLists.txt3
5 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8aa16b..cb118c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.8.12)
set(QT_MIN_VERSION "5.2.0")
-find_package(ECM 1.2.0 CONFIG REQUIRED)
+find_package(ECM 1.7.0 CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
include(ECMInstallIcons)
@@ -16,7 +16,7 @@ include(KDEFrameworkCompilerSettings)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(ECMAddTests)
-
+include(ECMAddAppIcon)
find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Test Widgets PrintSupport Svg Qml Quick)
find_package(Qt5 OPTIONAL_COMPONENTS TextToSpeech)
diff --git a/generators/spectre/CMakeLists.txt b/generators/spectre/CMakeLists.txt
index 71e66b3..bdcd5b1 100644
--- a/generators/spectre/CMakeLists.txt
+++ b/generators/spectre/CMakeLists.txt
@@ -33,4 +33,4 @@ install(TARGETS okularGenerator_ghostview DESTINATION ${PLUGIN_INSTALL_DIR})
install( FILES libokularGenerator_ghostview.desktop okularGhostview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( PROGRAMS okularApplication_ghostview.desktop active-documentviewer_ghostview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-ecm_install_icons(${DATA_INSTALL_DIR}/okular/icons)
+ecm_install_icons(ICONS hi16-apps-okular-gv.png hi32-app-okulars-gv.png DESTINATION ${DATA_INSTALL_DIR}/okular/icons)
diff --git a/generators/spectre/hi16-app-okular-gv.png b/generators/spectre/hi16-apps-okular-gv.png
index bbba0e1..bbba0e1 100644
--- a/generators/spectre/hi16-app-okular-gv.png
+++ b/generators/spectre/hi16-apps-okular-gv.png
Binary files differ
diff --git a/generators/spectre/hi32-app-okular-gv.png b/generators/spectre/hi32-app-okulars-gv.png
index f2b8d0b..f2b8d0b 100644
--- a/generators/spectre/hi32-app-okular-gv.png
+++ b/generators/spectre/hi32-app-okulars-gv.png
Binary files differ
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index be81505..ddbb9aa 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -21,7 +21,8 @@ set(okular_SRCS
shellutils.cpp
)
-kde4_add_app_icon(okular_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../ui/data/icons/hi*-apps-okular.png")
+file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../ui/data/icons/hi*-apps-okular.png")
+ecm_add_app_icon(okular_SRCS ICONS ${ICONS_SRCS})
add_executable(okular ${okular_SRCS})