tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use target-centric CMake approach rest of logging categories

Browse source
This commit is contained in:
Alexander Lohnau 2023-07-20 16:59:37 +03:00 committed by Albert Vaca Cintora
parent 41d474b1a5
commit 9fdc2901b2
4 changed files with 25 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
interfaces/CMakeLists.txt
View file

@ -10,19 +10,6 @@ function(geninterface source_h output_h)
set(libkdeconnect_SRC ${libkdeconnect_SRC} PARENT_SCOPE) set(libkdeconnect_SRC ${libkdeconnect_SRC} PARENT_SCOPE)
endfunction() endfunction()
set(debug_files_SRCS)
ecm_qt_declare_logging_category(
debug_files_SRCS HEADER interfaces_conversation_message_debug.h
IDENTIFIER CONVERSATION_MESSAGE_LOGGING_CATEGORY CATEGORY_NAME kdeconnect.interfaces.conversationmessage
DEFAULT_SEVERITY Warning
EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (conversation message)")
ecm_qt_declare_logging_category(
debug_files_SRCS HEADER interfaces_debug.h
IDENTIFIER KDECONNECT_INTERFACES CATEGORY_NAME kdeconnect.interfaces
DEFAULT_SEVERITY Warning
EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (interfaces)")
set(libkdeconnect_SRC set(libkdeconnect_SRC
dbusinterfaces.cpp dbusinterfaces.cpp
devicesmodel.cpp devicesmodel.cpp
@ -34,8 +21,6 @@ set(libkdeconnect_SRC
devicespluginfilterproxymodel.cpp devicespluginfilterproxymodel.cpp
pluginmodel.cpp pluginmodel.cpp
commandsmodel.cpp commandsmodel.cpp
# modeltest.cpp
${debug_files_SRCS}
) )
geninterface(${PROJECT_SOURCE_DIR}/core/daemon.h daemoninterface) geninterface(${PROJECT_SOURCE_DIR}/core/daemon.h daemoninterface)
@ -68,6 +53,19 @@ else()
endif() endif()
target_sources(kdeconnectinterfaces PRIVATE ${libkdeconnect_SRC}) target_sources(kdeconnectinterfaces PRIVATE ${libkdeconnect_SRC})
ecm_qt_declare_logging_category(kdeconnectinterfaces
HEADER interfaces_conversation_message_debug.h
IDENTIFIER CONVERSATION_MESSAGE_LOGGING_CATEGORY CATEGORY_NAME kdeconnect.interfaces.conversationmessage
DEFAULT_SEVERITY Warning
EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (conversation message)")
ecm_qt_declare_logging_category(kdeconnectinterfaces
HEADER interfaces_debug.h
IDENTIFIER KDECONNECT_INTERFACES CATEGORY_NAME kdeconnect.interfaces
DEFAULT_SEVERITY Warning
EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (interfaces)")
set_target_properties(kdeconnectinterfaces PROPERTIES set_target_properties(kdeconnectinterfaces PROPERTIES
VERSION ${KDECONNECT_VERSION} VERSION ${KDECONNECT_VERSION}
SOVERSION ${KDECONNECT_VERSION_MAJOR} SOVERSION ${KDECONNECT_VERSION_MAJOR}

12
plugins/clipboard/CMakeLists.txt
View file

@ -1,11 +1,11 @@
ecm_qt_declare_logging_category( kdeconnect_add_plugin(kdeconnect_clipboard SOURCES clipboardplugin.cpp clipboardlistener.cpp)
debug_file_SRCS HEADER plugin_clipboard_debug.h
ecm_qt_declare_logging_category(kdeconnect_clipboard
HEADER plugin_clipboard_debug.h
IDENTIFIER KDECONNECT_PLUGIN_CLIPBOARD CATEGORY_NAME kdeconnect.plugin.clipboard IDENTIFIER KDECONNECT_PLUGIN_CLIPBOARD CATEGORY_NAME kdeconnect.plugin.clipboard
DEFAULT_SEVERITY Warning DEFAULT_SEVERITY Warning
EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin clipboard)") EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin clipboard)")
kdeconnect_add_plugin(kdeconnect_clipboard SOURCES clipboardplugin.cpp clipboardlistener.cpp ${debug_file_SRCS})
target_link_libraries(kdeconnect_clipboard kdeconnectcore target_link_libraries(kdeconnect_clipboard kdeconnectcore
KF${QT_MAJOR_VERSION}::GuiAddons KF${QT_MAJOR_VERSION}::GuiAddons
Qt${QT_MAJOR_VERSION}::DBus Qt${QT_MAJOR_VERSION}::DBus
@ -15,8 +15,8 @@ target_link_libraries(kdeconnect_clipboard kdeconnectcore
kcoreaddons_add_plugin(kdeconnect_clipboard_config INSTALL_NAMESPACE "kdeconnect/kcms") kcoreaddons_add_plugin(kdeconnect_clipboard_config INSTALL_NAMESPACE "kdeconnect/kcms")
ki18n_wrap_ui(kdeconnect_clipboard_config clipboard_config.ui) ki18n_wrap_ui(kdeconnect_clipboard_config clipboard_config.ui)
target_sources(kdeconnect_clipboard_config PRIVATE clipboard_config.cpp ${debug_file_SRCS}) target_sources(kdeconnect_clipboard_config PRIVATE clipboard_config.cpp)
target_link_libraries( kdeconnect_clipboard_config target_link_libraries(kdeconnect_clipboard_config
kdeconnectcore kdeconnectcore
kdeconnectpluginkcm kdeconnectpluginkcm
KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::I18n

19
plugins/findthisdevice/CMakeLists.txt
View file

@ -1,18 +1,11 @@
set(debug_file_SRCS) kdeconnect_add_plugin(kdeconnect_findthisdevice SOURCES findthisdeviceplugin.cpp)
ecm_qt_declare_logging_category(
debug_file_SRCS HEADER plugin_findthisdevice_debug.h ecm_qt_declare_logging_category(kdeconnect_findthisdevice
HEADER plugin_findthisdevice_debug.h
IDENTIFIER KDECONNECT_PLUGIN_FINDTHISDEVICE CATEGORY_NAME kdeconnect.plugin.findthisdevice IDENTIFIER KDECONNECT_PLUGIN_FINDTHISDEVICE CATEGORY_NAME kdeconnect.plugin.findthisdevice
DEFAULT_SEVERITY Warning DEFAULT_SEVERITY Warning
EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin findthisdevice)") EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin findthisdevice)")
set(kdeconnect_findthisdevice_SRCS
findthisdeviceplugin.cpp
${debug_file_SRCS}
)
kdeconnect_add_plugin(kdeconnect_findthisdevice
SOURCES ${kdeconnect_findthisdevice_SRCS})
target_link_libraries(kdeconnect_findthisdevice target_link_libraries(kdeconnect_findthisdevice
kdeconnectcore kdeconnectcore
Qt::Core Qt::Core
@ -29,12 +22,12 @@ endif()
kcoreaddons_add_plugin(kdeconnect_findthisdevice_config INSTALL_NAMESPACE "kdeconnect/kcms") kcoreaddons_add_plugin(kdeconnect_findthisdevice_config INSTALL_NAMESPACE "kdeconnect/kcms")
ki18n_wrap_ui(kdeconnect_findthisdevice_config findthisdevice_config.ui) ki18n_wrap_ui(kdeconnect_findthisdevice_config findthisdevice_config.ui)
target_sources(kdeconnect_findthisdevice_config PRIVATE findthisdevice_config.cpp ${debug_file_SRCS}) target_sources(kdeconnect_findthisdevice_config PRIVATE findthisdevice_config.cpp)
target_link_libraries(kdeconnect_findthisdevice_config target_link_libraries(kdeconnect_findthisdevice_config
kdeconnectpluginkcm kdeconnectpluginkcm
Qt::Multimedia Qt::Multimedia
KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::I18n
KF${QT_MAJOR_VERSION}::CoreAddons KF${QT_MAJOR_VERSION}::CoreAddons
KF${QT_MAJOR_VERSION}::ConfigWidgets KF${QT_MAJOR_VERSION}::ConfigWidgets
KF${QT_MAJOR_VERSION}::KIOWidgets # KUrlRequester KF${QT_MAJOR_VERSION}::KIOWidgets # KUrlRequester
) )

2
plugins/findthisdevice/findthisdeviceplugin.h
View file

@ -19,8 +19,6 @@
#include <QStandardPaths> #include <QStandardPaths>
#include <QUrl> #include <QUrl>
#endif #endif
// Qt
#include "plugin_findthisdevice_debug.h"
#define PACKET_TYPE_FINDMYPHONE_REQUEST QStringLiteral("kdeconnect.findmyphone.request") #define PACKET_TYPE_FINDMYPHONE_REQUEST QStringLiteral("kdeconnect.findmyphone.request")