diff --git a/CMakeLists.txt b/CMakeLists.txt index cfadc96..da7eda8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,66 +1,67 @@ project(kmahjongg) cmake_minimum_required (VERSION 3.5 FATAL_ERROR) set(QT_MIN_VERSION "5.9.0") set(KF5_MIN_VERSION "5.46.0") find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) if(ENABLE_CLAZY) set(CMAKE_CXX_COMPILER clazy) endif() set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Gui Svg) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons Crash DBusAddons Declarative DocTools NewStuff XmlGui ) include(FeatureSummary) include(GenerateExportHeader) include(ECMPackageConfigHelpers) include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMMarkNonGuiExecutable) include(KDEInstallDirs) +include(ECMAddAppIcon) include(ECMInstallIcons) include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMQtDeclareLoggingCategory) find_package(KF5KMahjongglib REQUIRED) find_package(KF5KDEGames 4.9.0 REQUIRED) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) add_subdirectory(src) add_subdirectory(icons) add_subdirectory(layouts) add_subdirectory(doc) ########### next target ############### ########### install files ############### install(PROGRAMS org.kde.kmahjongg.desktop DESTINATION ${KDE_INSTALL_APPDIR}) install(FILES org.kde.kmahjongg.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) if (${ECM_VERSION} STRGREATER "5.58.0") install(FILES kmahjongg.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) else() install(FILES kmahjongg.categories DESTINATION ${KDE_INSTALL_CONFDIR}) endif() ########### Display Summary ############### feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5fa491e..35f3adb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,44 +1,46 @@ set(kmahjongg_SRCS main.cpp kmahjongg_debug.cpp kmahjongg.cpp boardlayout.cpp gamedata.cpp kmahjongglayoutselector.cpp kmahjongglayout.cpp editor.cpp frameimage.cpp gameitem.cpp gamebackground.cpp gameremovedtiles.cpp gameview.cpp gamescene.cpp selectionanimation.cpp demoanimation.cpp movelistanimation.cpp ) ki18n_wrap_ui(kmahjongg_SRCS settings.ui gametype.ui) ecm_qt_declare_logging_category(kmahjongg_SRCS HEADER kmahjongg_debug.h IDENTIFIER KMAHJONGG_LOG CATEGORY_NAME log_kmahjongg) kconfig_add_kcfg_files(kmahjongg_SRCS prefs.kcfgc) +file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/*-apps-kmahjongg.png") +ecm_add_app_icon(kmahjongg_SRCS ICONS ${ICONS_SRCS}) add_executable(kmahjongg ${kmahjongg_SRCS}) target_link_libraries(kmahjongg Qt5::Gui KF5::CoreAddons KF5::XmlGui KF5::DBusAddons KF5::Crash KF5KDEGames KF5KDEGamesPrivate KF5KMahjongglib ) install(TARGETS kmahjongg ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES kmahjongg.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR}) install(FILES kmahjonggui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kmahjongg)