diff --git a/CMakeLists.txt b/CMakeLists.txt index a9437de..c26f987 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,72 +1,76 @@ project(kshisen) cmake_minimum_required (VERSION 3.5 FATAL_ERROR) set(QT_MIN_VERSION "5.7.0") set(KF5_MIN_VERSION "5.30.0") set(CMAKE_CXX_STANDARD 14) # C++14... set(CMAKE_CXX_STANDARD_REQUIRED ON) # ...is required... set(CMAKE_CXX_EXTENSIONS OFF) # ...without compiler extensions like gnu++14 # Found this somewhere but cannot re-find it now ... but want to investigate later, so keeping this here for now. #set(CXX_CLANG_TIDY ON) 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) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config Crash DBusAddons DocTools XmlGui ) include(FeatureSummary) include(ECMAddAppIcon) include(GenerateExportHeader) include(CMakePackageConfigHelpers) include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMMarkNonGuiExecutable) include(KDEInstallDirs) include(ECMInstallIcons) include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMQtDeclareLoggingCategory) find_package(KF5KMahjongglib REQUIRED) find_package(KF5KDEGames 4.9.0 REQUIRED) if (${KF5Config_VERSION} STRGREATER "5.56.0") add_definitions(-DQT_NO_FOREACH) MESSAGE(STATUS "compile without foreach") endif() add_definitions( -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_URL_CAST_FROM_STRING -DQT_USE_QSTRINGBUILDER -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT ) add_subdirectory(src) add_subdirectory(icons) add_subdirectory(sounds) add_subdirectory(doc) install(PROGRAMS org.kde.kshisen.desktop DESTINATION ${KDE_INSTALL_APPDIR}) install(FILES org.kde.kshisen.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) -install( FILES kshisen.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) +if (${ECM_VERSION} STRGREATER "5.58.0") + install(FILES kshisen.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) +else() + install(FILES kshisen.categories DESTINATION ${KDE_INSTALL_CONFDIR}) +endif() ########### Display Summary ############### feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)