diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sonnet_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) -# contains list of debug categories, for kdebugsettings -install(FILES sonnet.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/sonnet.categories b/sonnet.categories deleted file mode 100644 --- a/sonnet.categories +++ /dev/null @@ -1,8 +0,0 @@ -# Logging categories (for kdebugsettings) -sonnet.plugins.hunspell Sonnet HUnspell plugin IDENTIFIER [SONNET_HUNSPELL] -sonnet.plugins.hspell Sonnet Hspell plugin IDENTIFIER [SONNET_LOG_HSPELL] -sonnet.plugins.aspell Sonnet Aspell plugin IDENTIFIER [SONNET_LOG_ASPELL] -sonnet.plugins.voikko Sonnet Voikko plugin IDENTIFIER [SONNET_VOIKKO] -sonnet.core Sonnet Core IDENTIFIER [SONNET_LOG_CORE] -sonnet.ui Sonnet UI IDENTIFIER [SONNET_LOG_UI] - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,3 +3,9 @@ if(TARGET Qt5::Widgets) add_subdirectory(ui) endif() + +ecm_qt_install_logging_categories( + EXPORT SONNET + FILE sonnet.categories + DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} +) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -21,7 +21,13 @@ qt5_add_resources(sonnetcore_SRCS "${CMAKE_BINARY_DIR}/data/trigrams.qrc") endif() -ecm_qt_declare_logging_category(sonnetcore_SRCS HEADER core_debug.h IDENTIFIER SONNET_LOG_CORE CATEGORY_NAME sonnet.core) +ecm_qt_declare_logging_category(sonnetcore_SRCS + HEADER core_debug.h + IDENTIFIER SONNET_LOG_CORE + CATEGORY_NAME sonnet.core + DESCRIPTION "Sonnet Core" + EXPORT SONNET +) # Dear packagers, this is just used as an extra search paths for plugins. Don't get your panties in a twist. add_definitions(-DINSTALLATION_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_PLUGINDIR}") diff --git a/src/plugins/aspell/CMakeLists.txt b/src/plugins/aspell/CMakeLists.txt --- a/src/plugins/aspell/CMakeLists.txt +++ b/src/plugins/aspell/CMakeLists.txt @@ -5,7 +5,13 @@ ########### next target ############### set(sonnet_aspell_PART_SRCS aspellclient.cpp aspelldict.cpp) -ecm_qt_declare_logging_category(sonnet_aspell_PART_SRCS HEADER aspell_debug.h IDENTIFIER SONNET_LOG_ASPELL CATEGORY_NAME sonnet.plugins.aspell) +ecm_qt_declare_logging_category(sonnet_aspell_PART_SRCS + HEADER aspell_debug.h + IDENTIFIER SONNET_LOG_ASPELL + CATEGORY_NAME sonnet.plugins.aspell + DESCRIPTION "Sonnet Aspell plugin" + EXPORT SONNET +) add_library(sonnet_aspell MODULE ${sonnet_aspell_PART_SRCS}) diff --git a/src/plugins/hspell/CMakeLists.txt b/src/plugins/hspell/CMakeLists.txt --- a/src/plugins/hspell/CMakeLists.txt +++ b/src/plugins/hspell/CMakeLists.txt @@ -12,7 +12,13 @@ set(sonnet_hspell_PART_SRCS hspellclient.cpp hspelldict.cpp) -ecm_qt_declare_logging_category(sonnet_hspell_PART_SRCS HEADER hspell_debug.h IDENTIFIER SONNET_LOG_HSPELL CATEGORY_NAME sonnet.plugins.hspell) +ecm_qt_declare_logging_category(sonnet_hspell_PART_SRCS + HEADER hspell_debug.h + IDENTIFIER SONNET_LOG_HSPELL + CATEGORY_NAME sonnet.plugins.hspell + DESCRIPTION "Sonnet Hspell plugin" + EXPORT SONNET +) add_library(sonnet_hspell MODULE ${sonnet_hspell_PART_SRCS}) diff --git a/src/plugins/hunspell/CMakeLists.txt b/src/plugins/hunspell/CMakeLists.txt --- a/src/plugins/hunspell/CMakeLists.txt +++ b/src/plugins/hunspell/CMakeLists.txt @@ -2,7 +2,13 @@ hunspellclient.cpp hunspelldict.cpp ) -ecm_qt_declare_logging_category(sonnet_hunspell_PART_SRCS HEADER hunspelldebug.h IDENTIFIER SONNET_HUNSPELL CATEGORY_NAME sonnet.plugins.hunspell) +ecm_qt_declare_logging_category(sonnet_hunspell_PART_SRCS + HEADER hunspelldebug.h + IDENTIFIER SONNET_HUNSPELL + CATEGORY_NAME sonnet.plugins.hunspell + DESCRIPTION "Sonnet HUnspell plugin" + EXPORT SONNET +) # see: https://phabricator.kde.org/R246:0a96acf251baa5c9dd042d093ab2bf8fcee10502 set(USE_OLD_HUNSPELL_API TRUE) diff --git a/src/plugins/ispellchecker/CMakeLists.txt b/src/plugins/ispellchecker/CMakeLists.txt --- a/src/plugins/ispellchecker/CMakeLists.txt +++ b/src/plugins/ispellchecker/CMakeLists.txt @@ -5,7 +5,13 @@ ispellcheckerclient.cpp ispellcheckerdict.cpp ) -ecm_qt_declare_logging_category(sonnet_ispellchecker_PART_SRCS HEADER ispellcheckerdebug.h IDENTIFIER SONNET_ISPELLCHECKER CATEGORY_NAME sonnet.plugins.ispellchecker) +ecm_qt_declare_logging_category(sonnet_ispellchecker_PART_SRCS + HEADER ispellcheckerdebug.h + IDENTIFIER SONNET_ISPELLCHECKER + CATEGORY_NAME sonnet.plugins.ispellchecker + DESCRIPTION "Sonnet ISpellChecker plugin" + EXPORT SONNET +) add_library(sonnet_ispellchecker MODULE ${sonnet_ispellchecker_PART_SRCS}) target_link_libraries(sonnet_ispellchecker PRIVATE KF5::SonnetCore) diff --git a/src/plugins/nsspellchecker/CMakeLists.txt b/src/plugins/nsspellchecker/CMakeLists.txt --- a/src/plugins/nsspellchecker/CMakeLists.txt +++ b/src/plugins/nsspellchecker/CMakeLists.txt @@ -5,7 +5,10 @@ ecm_qt_declare_logging_category(sonnet_nsspellchecker_PART_SRCS HEADER nsspellcheckerdebug.h IDENTIFIER SONNET_NSSPELLCHECKER - CATEGORY_NAME sonnet.plugins.nsspellchecker) + CATEGORY_NAME sonnet.plugins.nsspellchecker + DESCRIPTION "Sonnet NSSpellChecker plugin" + EXPORT SONNET +) add_library(sonnet_nsspellchecker MODULE ${sonnet_nsspellchecker_PART_SRCS}) diff --git a/src/plugins/voikko/CMakeLists.txt b/src/plugins/voikko/CMakeLists.txt --- a/src/plugins/voikko/CMakeLists.txt +++ b/src/plugins/voikko/CMakeLists.txt @@ -4,7 +4,13 @@ ########### next target ############### set(sonnet_voikko_PART_SRCS voikkoclient.cpp voikkodict.cpp) -ecm_qt_declare_logging_category(sonnet_voikko_PART_SRCS HEADER voikkodebug.h IDENTIFIER SONNET_VOIKKO CATEGORY_NAME sonnet.plugins.voikko) +ecm_qt_declare_logging_category(sonnet_voikko_PART_SRCS + HEADER voikkodebug.h + IDENTIFIER SONNET_VOIKKO + CATEGORY_NAME sonnet.plugins.voikko + DESCRIPTION "Sonnet Voikko plugin" + EXPORT SONNET +) add_library(sonnet_voikko MODULE ${sonnet_voikko_PART_SRCS}) diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -12,7 +12,13 @@ ${sonnet_QM_LOADER} ) -ecm_qt_declare_logging_category(sonnetui_SRCS HEADER ui_debug.h IDENTIFIER SONNET_LOG_UI CATEGORY_NAME sonnet.ui) +ecm_qt_declare_logging_category(sonnetui_SRCS + HEADER ui_debug.h + IDENTIFIER SONNET_LOG_UI + CATEGORY_NAME sonnet.ui + DESCRIPTION "Sonnet UI" + EXPORT SONNET +) set(sonnetui_UI configui.ui