Commit 938cc280 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: Prepare 5.14.0 beta1. Update ecm as 5.67.0 is broken see 417396....

GIT_SILENT: Prepare 5.14.0 beta1. Update ecm as 5.67.0 is broken see 417396. 5.68 will be release in 2 days. But dependancy freeze is tomorrow.
parent 65113044
cmake_minimum_required(VERSION 3.5)
set(PIM_VERSION "5.13.40")
set(PIM_VERSION "5.13.80")
project(calendarsupport VERSION ${PIM_VERSION})
set(KF5_MIN_VERSION "5.67.0")
set(KF5_MIN_VERSION "5.68.0")
find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
......@@ -92,10 +92,6 @@ add_definitions(-DQT_NO_FOREACH)
add_subdirectory(src)
if (ECM_VERSION VERSION_LESS "5.68.0")
install(FILES calendarsupport.categories calendarsupport.renamecategories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
endif()
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
org.kde.pim.calendarsupport calendarsupport (calendarsupport) IDENTIFIER [CALENDARSUPPORT_LOG]
log_calendarsupport org.kde.pim.calendarsupport
......@@ -45,13 +45,9 @@ ki18n_wrap_ui(calendarsupport_LIB_SRCS
printing/calprintweekconfig_base.ui
printing/calprintyearconfig_base.ui
)
if (ECM_VERSION VERSION_LESS "5.68.0")
ecm_qt_declare_logging_category(calendarsupport_LIB_SRCS HEADER calendarsupport_debug.h IDENTIFIER CALENDARSUPPORT_LOG CATEGORY_NAME org.kde.pim.calendarsupport)
else()
ecm_qt_declare_logging_category(calendarsupport_LIB_SRCS HEADER calendarsupport_debug.h IDENTIFIER CALENDARSUPPORT_LOG CATEGORY_NAME org.kde.pim.calendarsupport
ecm_qt_declare_logging_category(calendarsupport_LIB_SRCS HEADER calendarsupport_debug.h IDENTIFIER CALENDARSUPPORT_LOG CATEGORY_NAME org.kde.pim.calendarsupport
OLD_CATEGORY_NAMES log_calendarsupport
DESCRIPTION "calendarsupport (calendarsupport)" EXPORT CALENDARSUPPORT)
endif()
kconfig_add_kcfg_files(calendarsupport_LIB_SRCS kcalprefs_base.kcfgc)
......@@ -189,6 +185,4 @@ if(BUILD_TESTING)
endif()
if (NOT ECM_VERSION VERSION_LESS "5.68.0")
ecm_qt_install_logging_categories(EXPORT CALENDARSUPPORT FILE calendarsupport.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
endif()
ecm_qt_install_logging_categories(EXPORT CALENDARSUPPORT FILE calendarsupport.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment