From 90b2f6c62c63799d7b21c9da748c07dbda1a2006 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Sun, 1 Mar 2015 10:57:10 +0100
Subject: [PATCH] Fix install icons

---
 CMakeLists.txt                                      |   4 ++--
 generators/spectre/CMakeLists.txt                   |   2 +-
 ...16-app-okular-gv.png => hi16-apps-okular-gv.png} | Bin
 ...32-app-okular-gv.png => hi32-app-okulars-gv.png} | Bin
 shell/CMakeLists.txt                                |   3 ++-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename generators/spectre/{hi16-app-okular-gv.png => hi16-apps-okular-gv.png} (100%)
 rename generators/spectre/{hi32-app-okular-gv.png => hi32-app-okulars-gv.png} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8aa16b3d..cb118c385 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 71e66b346..bdcd5b101 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
similarity index 100%
rename from generators/spectre/hi16-app-okular-gv.png
rename to generators/spectre/hi16-apps-okular-gv.png
diff --git a/generators/spectre/hi32-app-okular-gv.png b/generators/spectre/hi32-app-okulars-gv.png
similarity index 100%
rename from generators/spectre/hi32-app-okular-gv.png
rename to generators/spectre/hi32-app-okulars-gv.png
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index be81505cf..ddbb9aa9a 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})