diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,6 +96,4 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) -install( FILES kcontacts.renamecategories kcontacts.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} ) - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/kcontacts.categories b/kcontacts.categories deleted file mode 100644 --- a/kcontacts.categories +++ /dev/null @@ -1 +0,0 @@ -org.kde.pim.kcontacts kcontacts (pim lib) IDENTIFIER [KCONTACTS_LOG] diff --git a/kcontacts.renamecategories b/kcontacts.renamecategories deleted file mode 100644 --- a/kcontacts.renamecategories +++ /dev/null @@ -1 +0,0 @@ -log_kcontacts org.kde.pim.kcontacts diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -46,7 +46,14 @@ converter/ldifconverter.cpp ) -ecm_qt_declare_logging_category(kcontacts_converter_SRCS HEADER kcontacts_debug.h IDENTIFIER KCONTACTS_LOG CATEGORY_NAME org.kde.pim.kcontacts) +ecm_qt_declare_logging_category(kcontacts_converter_SRCS + HEADER kcontacts_debug.h + IDENTIFIER KCONTACTS_LOG + CATEGORY_NAME org.kde.pim.kcontacts + OLD_CATEGORY_NAMES log_kcontacts + DESCRIPTION "kcontacts (pim lib)" + EXPORT KCONTACTS +) add_library(KF5Contacts ${kcontacts_SRCS} ${kcontacts_converter_SRCS}) @@ -131,6 +138,12 @@ COMPONENT Devel ) +ecm_qt_install_logging_categories( + EXPORT KCONTACTS + FILE kcontacts.categories + DESTINATION "${KDE_INSTALL_LOGGINGCATEGORIESDIR}" +) + ecm_generate_pri_file(BASE_NAME KContacts LIB_NAME KF5Contacts DEPS "CoreAddons" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KContacts) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})