diff --git a/CMakeLists.txt b/CMakeLists.txt index a3c896a..8fb911c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,75 +1,72 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.7.41") -project(KHolidays VERSION ${PIM_VERSION}) +set(KF5_VERSION "5.42.0") +project(KHolidays VERSION ${KF5_VERSION}) -# ECM setup -set(KF5_VERSION "5.41.0") - -find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) +find_package(ECM 5.42.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(GenerateExportHeader) include(ECMGenerateHeaders) include(ECMGeneratePriFile) include(CMakePackageConfigHelpers) include(ECMSetupVersion) include(ECMPoQmTools) include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMCoverageOption) -set(KHOLIDAYS_LIB_VERSION ${PIM_VERSION}) +set(KHOLIDAYS_LIB_VERSION ${KF5_VERSION}) ecm_setup_version(PROJECT VARIABLE_PREFIX KHOLIDAYS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kholidays_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5HolidaysConfigVersion.cmake" SOVERSION 5 ) ########### Find packages ########### set(QT_REQUIRED_VERSION 5.8.0) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Qml) remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII) add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) ########### Targets ########### add_subdirectory(src) if(BUILD_TESTING) add_subdirectory(autotests) endif() add_subdirectory(holidays) if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ecm_install_po_files_as_qm(po) endif() ########### CMake Config Files ########### set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Holidays") configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5HolidaysConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5HolidaysConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KF5HolidaysConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/KF5HolidaysConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) install(EXPORT KF5HolidaysTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5HolidaysTargets.cmake NAMESPACE KF5::) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kholidays_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/metainfo.yaml b/metainfo.yaml index 6357c66..26c0acc 100644 --- a/metainfo.yaml +++ b/metainfo.yaml @@ -1,18 +1,17 @@ maintainer: jlayt description: Holiday calculation library tier: 1 type: functional platforms: - name: All portingAid: false deprecated: false -release: false +release: true libraries: - qmake: KHolidays cmake: "KF5::Holidays" cmakename: KF5Holidays public_lib: true -group: kdepim -platforms: - - name: Linux +group: Frameworks +subgroup: Tier 1