Use ecm_qt_install_logging_categories over manual categories file

6 years ago · 9941a691b7
parent 059a4feee4
commit 9941a691b7
5 changed files with 18 additions and 9 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -104,5 +104,3 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kconfig_version.h


 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-
-install(FILES kconfig.categories  DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
--- a/kconfig.categories
+++ b/kconfig.categories
@ -1 +0,0 @@
-kf5.kconfig.core KConfig Core DEFAULT_SEVERITY [WARNING] IDENTIFIER [KCONFIG_CORE_LOG]
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -6,6 +6,12 @@ add_subdirectory(kconfig_compiler)
 add_subdirectory(kconf_update)
 add_subdirectory(kreadconfig)

+ecm_qt_install_logging_categories(
+    EXPORT KCONFIG
+    FILE kconfig.categories
+    DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
+)
+
 if (BUILD_QCH)
    ecm_add_qch(
        KF5Config_QCH
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@ -16,7 +16,10 @@ set(libkconfigcore_SRCS
 ecm_qt_declare_logging_category(libkconfigcore_SRCS
    HEADER kconfig_core_log_settings.h
    IDENTIFIER KCONFIG_CORE_LOG
-                                CATEGORY_NAME kf5.kconfig.core)
+    CATEGORY_NAME kf5.kconfig.core
+    DESCRIPTION "KConfig Core"
+    EXPORT KCONFIG
+)

 configure_file(config-kconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kconfig.h )

--- a/src/kconf_update/CMakeLists.txt
+++ b/src/kconf_update/CMakeLists.txt
@ -10,7 +10,10 @@ set(kconf_update_SRCS
 ecm_qt_declare_logging_category(kconf_update_SRCS
    HEADER kconf_update_debug.h
    IDENTIFIER KCONF_UPDATE_LOG
-                                CATEGORY_NAME kf5.kconfig.update)
+    CATEGORY_NAME kf5.kconfig.update
+    DESCRIPTION "kconf_update"
+    EXPORT KCONFIG
+)

 add_executable(kconf_update ${kconf_update_SRCS})
 add_executable(KF5::kconf_update ALIAS kconf_update)
				`@ -1 +0,0 @@`
				`kf5.kconfig.core KConfig Core DEFAULT_SEVERITY [WARNING] IDENTIFIER [KCONFIG_CORE_LOG]`