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

Use versionless Qt targets where possible

Browse source 
We depend on 5.15 which allows us to use those
This commit is contained in:
Alexander Lohnau 2023-07-21 13:24:13 +03:00
parent 87c9032ab9
commit a1195a72a3
13 changed files with 21 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/CMakeLists.txt
View file

@ -57,13 +57,13 @@ target_include_directories(kdeconnectcore PUBLIC ${PROJECT_SOURCE_DIR})
target_link_libraries(kdeconnectcore target_link_libraries(kdeconnectcore
PUBLIC PUBLIC
Qt${QT_MAJOR_VERSION}::Network Qt::Network
KF${QT_MAJOR_VERSION}::CoreAddons KF${QT_MAJOR_VERSION}::CoreAddons
${Qca_LIBRARY} ${Qca_LIBRARY}
KF${QT_MAJOR_VERSION}::KIOCore KF${QT_MAJOR_VERSION}::KIOCore
KF${QT_MAJOR_VERSION}::KIOGui KF${QT_MAJOR_VERSION}::KIOGui
PRIVATE PRIVATE
Qt${QT_MAJOR_VERSION}::DBus Qt::DBus
KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::I18n
KF${QT_MAJOR_VERSION}::ConfigCore KF${QT_MAJOR_VERSION}::ConfigCore
) )

4
interfaces/CMakeLists.txt
View file

@ -101,8 +101,8 @@ generate_export_header(kdeconnectinterfaces EXPORT_FILE_NAME ${CMAKE_CURRENT_BIN
target_link_libraries(kdeconnectinterfaces target_link_libraries(kdeconnectinterfaces
LINK_PUBLIC LINK_PUBLIC
Qt${QT_MAJOR_VERSION}::Gui Qt::Gui
Qt${QT_MAJOR_VERSION}::DBus Qt::DBus
KF${QT_MAJOR_VERSION}::ConfigCore KF${QT_MAJOR_VERSION}::ConfigCore
LINK_PRIVATE LINK_PRIVATE
kdeconnectcore kdeconnectcore

2
plugins/battery/CMakeLists.txt
View file

@ -7,7 +7,7 @@ ecm_qt_declare_logging_category(kdeconnect_battery
EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin battery)") EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin battery)")
target_link_libraries(kdeconnect_battery target_link_libraries(kdeconnect_battery
kdeconnectcore kdeconnectcore
Qt${QT_MAJOR_VERSION}::DBus Qt::DBus
KF${QT_MAJOR_VERSION}::Solid KF${QT_MAJOR_VERSION}::Solid
KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::I18n
) )

8
plugins/bigscreen/CMakeLists.txt
View file

@ -1,11 +1,7 @@
set(kdeconnect_bigscreen_SRCS kdeconnect_add_plugin(kdeconnect_bigscreen SOURCES bigscreenplugin.cpp)
bigscreenplugin.cpp
)
kdeconnect_add_plugin(kdeconnect_bigscreen SOURCES ${kdeconnect_bigscreen_SRCS})
target_link_libraries(kdeconnect_bigscreen target_link_libraries(kdeconnect_bigscreen
kdeconnectcore kdeconnectcore
kdeconnectinterfaces kdeconnectinterfaces
Qt${QT_MAJOR_VERSION}::DBus Qt::DBus
KF${QT_MAJOR_VERSION}::I18n) KF${QT_MAJOR_VERSION}::I18n)

11
plugins/clipboard/CMakeLists.txt
View file

@ -7,15 +7,14 @@ ecm_qt_declare_logging_category(kdeconnect_clipboard
EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin clipboard)") EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin clipboard)")
target_link_libraries(kdeconnect_clipboard kdeconnectcore target_link_libraries(kdeconnect_clipboard kdeconnectcore
KF${QT_MAJOR_VERSION}::GuiAddons Qt::DBus
Qt${QT_MAJOR_VERSION}::DBus KF${QT_MAJOR_VERSION}::GuiAddons
${kdeconnect_clipboard_WL_LINK_LIBS} ${kdeconnect_clipboard_WL_LINK_LIBS}
) )
kcoreaddons_add_plugin(kdeconnect_clipboard_config INSTALL_NAMESPACE "kdeconnect/kcms") kcoreaddons_add_plugin(kdeconnect_clipboard_config SOURCES clipboard_config.cpp 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)
target_link_libraries(kdeconnect_clipboard_config target_link_libraries(kdeconnect_clipboard_config
kdeconnectcore kdeconnectcore
kdeconnectpluginkcm kdeconnectpluginkcm

2
plugins/connectivity-report/CMakeLists.txt
View file

@ -7,7 +7,7 @@ ecm_qt_declare_logging_category(kdeconnect_connectivity_report
target_link_libraries(kdeconnect_connectivity_report target_link_libraries(kdeconnect_connectivity_report
kdeconnectcore kdeconnectcore
Qt${QT_MAJOR_VERSION}::DBus Qt::DBus
KF${QT_MAJOR_VERSION}::Solid KF${QT_MAJOR_VERSION}::Solid
KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::I18n
) )

2
plugins/mmtelephony/CMakeLists.txt
View file

@ -8,7 +8,7 @@ ecm_qt_declare_logging_category(kdeconnect_mmtelephony
target_link_libraries(kdeconnect_mmtelephony target_link_libraries(kdeconnect_mmtelephony
kdeconnectcore kdeconnectcore
Qt${QT_MAJOR_VERSION}::DBus Qt::DBus
KF${QT_MAJOR_VERSION}::ModemManagerQt KF${QT_MAJOR_VERSION}::ModemManagerQt
KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::I18n
) )

2
plugins/ping/CMakeLists.txt
View file

@ -8,6 +8,6 @@ ecm_qt_declare_logging_category(kdeconnect_ping
target_link_libraries(kdeconnect_ping target_link_libraries(kdeconnect_ping
kdeconnectcore kdeconnectcore
Qt${QT_MAJOR_VERSION}::DBus Qt::DBus
KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::I18n
) )

4
plugins/presenter/CMakeLists.txt
View file

@ -9,7 +9,7 @@ ecm_qt_declare_logging_category(kdeconnect_presenter
target_link_libraries(kdeconnect_presenter target_link_libraries(kdeconnect_presenter
kdeconnectcore kdeconnectcore
Qt${QT_MAJOR_VERSION}::DBus Qt::DBus
Qt${QT_MAJOR_VERSION}::Quick Qt::Quick
KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::I18n
) )

2
plugins/remotecommands/CMakeLists.txt
View file

@ -7,5 +7,5 @@ ecm_qt_declare_logging_category(kdeconnect_remotecommands
EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin remotecommands)") EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin remotecommands)")
target_link_libraries(kdeconnect_remotecommands target_link_libraries(kdeconnect_remotecommands
kdeconnectcore kdeconnectcore
Qt${QT_MAJOR_VERSION}::DBus Qt::DBus
) )

2
plugins/remotecontrol/CMakeLists.txt
View file

@ -7,6 +7,6 @@ ecm_qt_declare_logging_category(kdeconnect_remotecontrol
EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin remotecontrol)") EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin remotecontrol)")
target_link_libraries(kdeconnect_remotecontrol target_link_libraries(kdeconnect_remotecontrol
kdeconnectcore kdeconnectcore
Qt${QT_MAJOR_VERSION}::DBus Qt::DBus
KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::I18n
) )

2
plugins/remotesystemvolume/CMakeLists.txt
View file

@ -7,6 +7,6 @@ ecm_qt_declare_logging_category(kdeconnect_remotesystemvolume
EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin remotesystemvolume)") EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin remotesystemvolume)")
target_link_libraries(kdeconnect_remotesystemvolume target_link_libraries(kdeconnect_remotesystemvolume
kdeconnectcore kdeconnectcore
Qt${QT_MAJOR_VERSION}::DBus Qt::DBus
KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::I18n
) )

2
plugins/runcommand/CMakeLists.txt
View file

@ -7,7 +7,7 @@ ecm_qt_declare_logging_category(kdeconnect_runcommand
EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin runcommand)") EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin runcommand)")
target_link_libraries(kdeconnect_runcommand target_link_libraries(kdeconnect_runcommand
kdeconnectcore kdeconnectcore
Qt${QT_MAJOR_VERSION}::DBus Qt::DBus
KF${QT_MAJOR_VERSION}::KCMUtils KF${QT_MAJOR_VERSION}::KCMUtils
KF${QT_MAJOR_VERSION}::I18n) KF${QT_MAJOR_VERSION}::I18n)