diff --git a/CMakeLists.txt b/CMakeLists.txt index c5d9fe9..a452e75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,79 +1,79 @@ cmake_minimum_required (VERSION 3.5 FATAL_ERROR) # KDE Application Version, managed by release script -set(KDE_APPLICATIONS_VERSION_MAJOR "20") -set(KDE_APPLICATIONS_VERSION_MINOR "03") -set(KDE_APPLICATIONS_VERSION_MICRO "70") -set(KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") +set(RELEASE_SERVICE_VERSION_MAJOR "20") +set(RELEASE_SERVICE_VERSION_MINOR "03") +set(RELEASE_SERVICE_VERSION_MICRO "70") +set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") -project(kfourinline VERSION ${KDE_APPLICATIONS_VERSION}) +project(kfourinline VERSION ${RELEASE_SERVICE_VERSION}) set (QT_MIN_VERSION "5.7.0") set (KF5_MIN_VERSION "5.30.0") find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config ConfigWidgets CoreAddons Crash DNSSD DocTools I18n WidgetsAddons XmlGui ) find_package(KF5KDEGames 4.9.0 REQUIRED) include(FeatureSummary) include(ECMInstallIcons) include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMAddAppIcon) include(ECMQtDeclareLoggingCategory) include(ECMSetupVersion) if (${KF5Config_VERSION} STRGREATER "5.56.0") add_definitions(-DQT_NO_FOREACH) MESSAGE(STATUS "compile without foreach") endif() if (EXISTS "${CMAKE_SOURCE_DIR}/.git") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000) endif() add_subdirectory(src) add_subdirectory(grafix) add_subdirectory(doc) ########### install files ############### install(PROGRAMS org.kde.kfourinline.desktop DESTINATION ${KDE_INSTALL_APPDIR}) install(FILES org.kde.kfourinline.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) ecm_install_icons(ICONS 128-apps-kfourinline.png 16-apps-kfourinline.png 22-apps-kfourinline.png 32-apps-kfourinline.png 48-apps-kfourinline.png 64-apps-kfourinline.png DESTINATION ${KDE_INSTALL_ICONDIR} ) if (${ECM_VERSION} STRGREATER "5.58.0") install(FILES kfourinline.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) else() install(FILES kfourinline.categories DESTINATION ${KDE_INSTALL_CONFDIR}) endif() feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 39b38c9..bf2a1f2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,80 +1,80 @@ ########### next target ############### set(kwin4_SRCS main.cpp chatdlg.cpp kwin4.cpp spritenotify.cpp thememanager.cpp displayintro.cpp displaygame.cpp kwin4view.cpp kwin4doc.cpp kwin4player.cpp buttonsprite.cpp introsprite.cpp piecesprite.cpp scoresprite.cpp score.cpp aiboard.cpp reflectiongraphicsscene.cpp kgamedebugdialog.cpp kgamedialog.cpp kgamedialogconfig.cpp kgameconnectdialog.cpp kchatdialog.cpp pixmapsprite.cpp kfontutils.cpp ) qt5_add_resources(kwin4_SRCS kfourinline.qrc) configure_file(config-src.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-src.h) ki18n_wrap_ui(kwin4_SRCS settings.ui statuswidget.ui statistics.ui ) kconfig_add_kcfg_files(kwin4_SRCS prefs.kcfgc ) -ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX KFOURINLINE VERSION_HEADER kfourinline_version.h) +ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX KFOURINLINE VERSION_HEADER kfourinline_version.h) ecm_qt_declare_logging_category(kwin4_SRCS HEADER kfourinline_debug.h IDENTIFIER KFOURINLINE_LOG CATEGORY_NAME log_fourinline) file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../*-apps-k*.png") ecm_add_app_icon(kwin4_SRCS ICONS ${ICONS_SRCS}) add_executable(kfourinline ${kwin4_SRCS}) target_link_libraries(kfourinline KF5::CoreAddons KF5::Crash KF5::DNSSD KF5::XmlGui KF5::WidgetsAddons KF5KDEGames KF5KDEGamesPrivate Qt5::Svg ) install(TARGETS kfourinline ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) ########### next target ############### set(kwin4proc_SRCS aiboard.cpp kgameprocess.cpp kwin4proc.cpp ) add_executable(kfourinlineproc ${kwin4proc_SRCS}) target_link_libraries(kfourinlineproc KF5KDEGames KF5KDEGamesPrivate Qt5::Svg) install(TARGETS kfourinlineproc ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### install( FILES kwin4.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )