diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kconfig.categories | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/kconf_update/CMakeLists.txt | 9 |
5 files changed, 18 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6520cf30..fcb30144 100644 --- 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}) diff --git a/kconfig.categories b/kconfig.categories deleted file mode 100644 index 2403da7b..00000000 --- a/kconfig.categories +++ /dev/null @@ -1 +0,0 @@ -kf5.kconfig.core KConfig Core DEFAULT_SEVERITY [WARNING] IDENTIFIER [KCONFIG_CORE_LOG] diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2c61a9c6..4f61c001 100644 --- 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 diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 61a200a6..65386957 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -14,9 +14,12 @@ 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) + HEADER kconfig_core_log_settings.h + IDENTIFIER KCONFIG_CORE_LOG + CATEGORY_NAME kf5.kconfig.core + DESCRIPTION "KConfig Core" + EXPORT KCONFIG +) configure_file(config-kconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kconfig.h ) diff --git a/src/kconf_update/CMakeLists.txt b/src/kconf_update/CMakeLists.txt index 6947f949..32a43251 100644 --- a/src/kconf_update/CMakeLists.txt +++ b/src/kconf_update/CMakeLists.txt @@ -8,9 +8,12 @@ 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) + HEADER kconf_update_debug.h + IDENTIFIER KCONF_UPDATE_LOG + 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) |