diff --git a/hi16-app-kmag.png b/16-apps-kmag.png similarity index 100% rename from hi16-app-kmag.png rename to 16-apps-kmag.png diff --git a/hi32-app-kmag.png b/32-apps-kmag.png similarity index 100% rename from hi32-app-kmag.png rename to 32-apps-kmag.png diff --git a/CMakeLists.txt b/CMakeLists.txt index f16f701..1c51d42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,69 +1,70 @@ project(kmag) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) set(QT_MIN_VERSION "5.2.0") find_package(ECM 1.3.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) add_definitions(-DTRANSLATION_DOMAIN="kmag") include(KDEInstallDirs) include(KDECompilerSettings) include(KDECMakeSettings) +include(ECMInstallIcons) include(FeatureSummary) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Widgets ) find_package(KF5 REQUIRED COMPONENTS KDELibs4Support ) #macro_optional_find_package(QAccessibilityClient) #macro_log_feature(QAccessibilityClient_FOUND "qaccessibilityclient" "KDE client-side accessibility library" "https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient" FALSE "" "Required to enable keyboard focus tracking.") configure_file( "${PROJECT_SOURCE_DIR}/focustrackconfig.h.in" "${PROJECT_BINARY_DIR}/focustrackconfig.h") add_definitions( -DQT_NO_CAST_FROM_ASCII ) add_definitions( -DQT_NO_CAST_TO_ASCII ) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) if(QAccessibilityClient_FOUND) include_directories(${QACCESSIBILITYCLIENT_INCLUDE_DIR}) endif(QAccessibilityClient_FOUND) add_subdirectory( doc ) add_subdirectory( pics ) ########### next target ############### set(kmag_SRCS kmagzoomview.cpp kmagselrect.cpp kmag.cpp colorsim.cpp main.cpp ) add_executable(kmag ${kmag_SRCS}) target_link_libraries(kmag Qt5::Core Qt5::Widgets KF5::KDELibs4Support) if(QAccessibilityClient_FOUND) target_link_libraries(kmag ${QACCESSIBILITYCLIENT_LIBRARY}) endif(QAccessibilityClient_FOUND) install(TARGETS kmag ${INSTALL_TARGETS_DEFAULT_ARGS} ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ########### install files ############### install( PROGRAMS kmag.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES kmagui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kmag ) -kde4_install_icons( ${ICON_INSTALL_DIR} ) +ecm_install_icons( ICONS 16-apps-kmag.png 32-apps-kmag.png DESTINATION ${ICON_INSTALL_DIR} ) diff --git a/pics/hi16-action-followmouse.png b/pics/16-actions-followmouse.png similarity index 100% rename from pics/hi16-action-followmouse.png rename to pics/16-actions-followmouse.png diff --git a/pics/hi16-action-hidemouse.png b/pics/16-actions-hidemouse.png similarity index 100% rename from pics/hi16-action-hidemouse.png rename to pics/16-actions-hidemouse.png diff --git a/pics/hi16-action-window.png b/pics/16-actions-window.png similarity index 100% rename from pics/hi16-action-window.png rename to pics/16-actions-window.png diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt index 0bd070f..45416f8 100644 --- a/pics/CMakeLists.txt +++ b/pics/CMakeLists.txt @@ -1 +1,6 @@ -kde4_install_icons(${DATA_INSTALL_DIR}/kmag/icons) +set(kmag_icons + 16-actions-followmouse.png + 16-actions-hidemouse.png + 16-actions-window.png +) +ecm_install_icons(ICONS ${kmag_icons} DESTINATION ${DATA_INSTALL_DIR}/kmag/icons)