diff --git a/CMakeLists.txt b/CMakeLists.txt index ffc13445b..81a712434 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -225,6 +225,4 @@ install(EXPORT KF5PlasmaTargets install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) -install(FILES plasma-framework.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/plasma-framework.categories b/plasma-framework.categories deleted file mode 100644 index d66ce1d3b..000000000 --- a/plasma-framework.categories +++ /dev/null @@ -1,2 +0,0 @@ -org.kde.plasma Plasma Core lib DEFAULT_SEVERITY [WARNING] IDENTIFIER [LOG_PLASMA] -org.kde.plasma Plasma Quick lib DEFAULT_SEVERITY [WARNING] IDENTIFIER [LOG_PLASMAQUICK] diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5143c6d50..02d221d07 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,3 +4,9 @@ add_subdirectory(declarativeimports) add_subdirectory(plasmapkg) add_subdirectory(scriptengines) add_subdirectory(plasmaquick) + +ecm_qt_install_logging_categories( + EXPORT PLASMA + FILE plasma-framework.categories + DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} +) diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt index 98b2e1b98..936983ff9 100644 --- a/src/plasma/CMakeLists.txt +++ b/src/plasma/CMakeLists.txt @@ -83,7 +83,13 @@ kconfig_add_kcfg_files(Plasma_LIB_SRCS data/kconfigxt/libplasma-theme-global.kcf # TEST_INCLUDES #) -ecm_qt_declare_logging_category(Plasma_LIB_SRCS HEADER debug_p.h IDENTIFIER LOG_PLASMA CATEGORY_NAME org.kde.plasma) +ecm_qt_declare_logging_category(Plasma_LIB_SRCS + HEADER debug_p.h + IDENTIFIER LOG_PLASMA + CATEGORY_NAME org.kde.plasma + DESCRIPTION "Plasma Core lib" + EXPORT PLASMA +) add_library(KF5Plasma ${Plasma_LIB_SRCS}) add_library(KF5::Plasma ALIAS KF5Plasma) diff --git a/src/plasmaquick/CMakeLists.txt b/src/plasmaquick/CMakeLists.txt index 97784db06..5e698831a 100644 --- a/src/plasmaquick/CMakeLists.txt +++ b/src/plasmaquick/CMakeLists.txt @@ -25,7 +25,13 @@ if(HAVE_KWAYLAND) set(plasmaquick_LIB_SRC ${plasmaquick_LIB_SRC} waylandintegration.cpp) endif() -ecm_qt_declare_logging_category(PlasmaQuick_LIB_SRCS HEADER debug_p.h IDENTIFIER LOG_PLASMAQUICK CATEGORY_NAME org.kde.plasmaquick) +ecm_qt_declare_logging_category(PlasmaQuick_LIB_SRCS + HEADER debug_p.h + IDENTIFIER LOG_PLASMAQUICK + CATEGORY_NAME org.kde.plasmaquick + DESCRIPTION "Plasma Quick lib" + EXPORT PLASMA +) add_library(KF5PlasmaQuick SHARED ${plasmaquick_LIB_SRC}) add_library(KF5::PlasmaQuick ALIAS KF5PlasmaQuick)