diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,6 +130,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kcoreaddons_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) -install(FILES kcoreaddons.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/kcoreaddons.categories b/kcoreaddons.categories deleted file mode 100644 --- a/kcoreaddons.categories +++ /dev/null @@ -1,6 +0,0 @@ -kf5.kcoreaddons.kdirwatch KDirWatch (KCoreAddons) DEFAULT_SEVERITY [WARNING] IDENTIFIER [KDIRWATCH] -kf5.kcoreaddons.kaboutdata KAboutData (KCoreAddons) IDENTIFIER [KABOUTDATA] -kf5.kcoreaddons.desktopparser DesktopParser (KCoreAddons) DEFAULT_SEVERITY [WARNING] IDENTIFIER [DESKTOPPARSER] -kf5.kcoreaddons.kdelibs4configmigrator Kdelibs4ConfigMigrator (KCoreAddons) DEFAULT_SEVERITY [WARNING] IDENTIFIER [MIGRATOR] -org.kde.kcoreaddons kcoreaddons (kcoreaddons lib) IDENTIFIER [KCOREADDONS_DEBUG] - diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -128,10 +128,41 @@ ) endif() +ecm_qt_export_logging_category( + IDENTIFIER KDIRWATCH + CATEGORY_NAME kf5.kcoreaddons.kdirwatch + DEFAULT_SEVERITY Warning + DESCRIPTION "KDirWatch (KCoreAddons)" + EXPORT KCOREADDONS +) +ecm_qt_export_logging_category( + IDENTIFIER KABOUTDATA + CATEGORY_NAME kf5.kcoreaddons.kaboutdata + DESCRIPTION "KAboutData (KCoreAddons)" + EXPORT KCOREADDONS +) +ecm_qt_export_logging_category( + IDENTIFIER DESKTOPPARSER + CATEGORY_NAME kf5.kcoreaddons.desktopparser + DEFAULT_SEVERITY Warning + DESCRIPTION "DesktopParser (KCoreAddons)" + EXPORT KCOREADDONS +) +ecm_qt_export_logging_category( + IDENTIFIER MIGRATOR + CATEGORY_NAME kf5.kcoreaddons.kdelibs4configmigrator + DEFAULT_SEVERITY Warning + DESCRIPTION "Kdelibs4ConfigMigrator (KCoreAddons)" + EXPORT KCOREADDONS +) + ecm_qt_declare_logging_category(libkcoreaddons_SRCS - HEADER kcoreaddons_debug.h - IDENTIFIER KCOREADDONS_DEBUG - CATEGORY_NAME org.kde.kcoreaddons) + HEADER kcoreaddons_debug.h + IDENTIFIER KCOREADDONS_DEBUG + CATEGORY_NAME org.kde.kcoreaddons + DESCRIPTION "kcoreaddons (kcoreaddons lib)" + EXPORT KCOREADDONS +) add_library(KF5CoreAddons ${libkcoreaddons_SRCS}) add_library(KF5::CoreAddons ALIAS KF5CoreAddons) @@ -330,3 +361,9 @@ include(ECMGeneratePriFile) ecm_generate_pri_file(BASE_NAME KCoreAddons LIB_NAME KF5CoreAddons DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KCoreAddons) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) + +ecm_qt_install_logging_categories( + EXPORT KCOREADDONS + FILE kcoreaddons.categories + DESTINATION "${KDE_INSTALL_LOGGINGCATEGORIESDIR}" +)