Commit 90b2f6c6 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix install icons

parent 0b59e835
......@@ -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)
......
......@@ -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)
......@@ -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})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment