From 0f38bdced030eab12a811f6124e4da1ffc995aba Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Fri, 14 Jun 2019 07:20:48 +0200 Subject: [PATCH] Use the new logging category directory with ECM >= 5.59.0 --- klipper/CMakeLists.txt | 6 +++++- libnotificationmanager/CMakeLists.txt | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt index c52e99255..71345ae5f 100644 --- a/klipper/CMakeLists.txt +++ b/klipper/CMakeLists.txt @@ -104,5 +104,9 @@ if(BUILD_TESTING) add_subdirectory(autotests) endif() -install( FILES klipper.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) +if (${ECM_VERSION} STRGREATER "5.58.0") + install( FILES klipper.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} ) +else() + install( FILES klipper.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) +endif() diff --git a/libnotificationmanager/CMakeLists.txt b/libnotificationmanager/CMakeLists.txt index afbb801e8..1139cacf5 100644 --- a/libnotificationmanager/CMakeLists.txt +++ b/libnotificationmanager/CMakeLists.txt @@ -32,7 +32,12 @@ ecm_qt_declare_logging_category(notificationmanager_LIB_SRCS HEADER debug.h IDENTIFIER NOTIFICATIONMANAGER CATEGORY_NAME org.kde.plasma.notifications) -install(FILES libnotificationmanager.categories DESTINATION ${KDE_INSTALL_CONFDIR}) + +if (${ECM_VERSION} STRGREATER "5.58.0") + install(FILES libnotificationmanager.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) +else() + install(FILES libnotificationmanager.categories DESTINATION ${KDE_INSTALL_CONFDIR}) +endif() # Settings kconfig_add_kcfg_files(notificationmanager_LIB_SRCS kcfg/donotdisturbsettings.kcfgc)