From e79cc53c4fc364daf6e271bc9ae3edbc980bfe20 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sat, 22 Feb 2020 13:19:18 +0100 Subject: [PATCH] Autogenerate categories file --- CMakeLists.txt | 4 +++- src/CMakeLists.txt | 13 ++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ccc0eea..4ed4018 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,5 +129,7 @@ add_subdirectory(src) if(BUILD_TESTING) add_subdirectory(autotests) endif() -install(FILES mailcommon.renamecategories mailcommon.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) +if (ECM_VERSION VERSION_LESS "5.68.0") + install(FILES mailcommon.renamecategories mailcommon.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) +endif() feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 14e4d5b..db378bd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -197,7 +197,14 @@ kconfig_add_kcfg_files(libmailcommon_SRCS settings/mailcommonsettings_base.kcfgc ) -ecm_qt_declare_logging_category(libmailcommon_SRCS HEADER mailcommon_debug.h IDENTIFIER MAILCOMMON_LOG CATEGORY_NAME org.kde.pim.mailcommon) + +if (ECM_VERSION VERSION_LESS "5.68.0") + ecm_qt_declare_logging_category(libmailcommon_SRCS HEADER mailcommon_debug.h IDENTIFIER MAILCOMMON_LOG CATEGORY_NAME org.kde.pim.mailcommon) +else() + ecm_qt_declare_logging_category(libmailcommon_SRCS HEADER mailcommon_debug.h IDENTIFIER MAILCOMMON_LOG CATEGORY_NAME org.kde.pim.mailcommon + OLD_CATEGORY_NAMES log_mailcommon + DESCRIPTION "mailcommon (mailcommon)" EXPORT MAILCOMMON) +endif() set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/dbusinterfaces/org.freedesktop.Akonadi.MailFilterAgent.xml PROPERTIES INCLUDE "dbusoperators.h") @@ -507,3 +514,7 @@ install(FILES if(BUILD_DESIGNERPLUGIN) add_subdirectory(designer) endif() + +if (NOT ECM_VERSION VERSION_LESS "5.68.0") + ecm_qt_install_logging_categories(EXPORT MAILCOMMON FILE mailcommon.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) +endif()