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

Adapt build system to also support Qt 6

Browse source 
This is complicated by the Qt 5.6 requirement of SailfishOS, hopefully
that didn't get broken by this.
This commit is contained in:
Volker Krause 2022-10-29 16:51:41 +02:00
parent aa8432667d
commit 002848efa8
42 changed files with 102 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
CMakeLists.txt
View file

@ -62,8 +62,8 @@ if (SAILFISHOS)
add_definitions(-DSAILFISHOS) add_definitions(-DSAILFISHOS)
else() else()
find_package(Qca-qt5 ${QCA_MIN_VERSION} REQUIRED) find_package(Qca-qt${QT_MAJOR_VERSION} ${QCA_MIN_VERSION} REQUIRED)
set(Qca_LIBRARY qca-qt5) set(Qca_LIBRARY qca-qt${QT_MAJOR_VERSION})
set(KF5_REQUIRED_COMPONENTS I18n ConfigWidgets DBusAddons IconThemes Notifications KIO KCMUtils Service Solid Kirigami2 People WindowSystem GuiAddons) set(KF5_REQUIRED_COMPONENTS I18n ConfigWidgets DBusAddons IconThemes Notifications KIO KCMUtils Service Solid Kirigami2 People WindowSystem GuiAddons)
set(KF5_OPTIONAL_COMPONENTS DocTools Wayland) set(KF5_OPTIONAL_COMPONENTS DocTools Wayland)
@ -78,9 +78,11 @@ else()
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
find_package(KF5Package REQUIRED) find_package(KF5Package REQUIRED)
find_package(KF5PulseAudioQt) find_package(KF5PulseAudioQt)
find_package(QtWaylandScanner REQUIRED) if (QT_MAJOR_VERSION EQUAL "5")
find_package(QtWaylandScanner REQUIRED)
endif()
find_package(Wayland 1.9 REQUIRED Client) find_package(Wayland 1.9 REQUIRED Client)
find_package(Qt5 REQUIRED COMPONENTS WaylandClient) find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS WaylandClient)
find_package(PlasmaWaylandProtocols REQUIRED) find_package(PlasmaWaylandProtocols REQUIRED)
endif() endif()
@ -100,8 +102,8 @@ endif()
add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_KEYWORDS -DQT_NO_CAST_FROM_ASCII) add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_KEYWORDS -DQT_NO_CAST_FROM_ASCII)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS DBus Quick QuickControls2 Network Multimedia) find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS DBus Quick QuickControls2 Network Multimedia)
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE AND QT_MAJOR_VERSION EQUAL "5")
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras)
endif() endif()
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS ${KF5_REQUIRED_COMPONENTS}) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS ${KF5_REQUIRED_COMPONENTS})

2
app/CMakeLists.txt
View file

@ -22,7 +22,7 @@ add_executable(kdeconnect-app
${kdeconnect_SRCS} ${kdeconnect_SRCS}
${kdeconnect_custom_icons_SRCS} ${kdeconnect_custom_icons_SRCS}
) )
target_link_libraries(kdeconnect-app Qt5::Quick Qt5::QuickControls2 Qt5::Widgets KF5::CoreAddons KF5::I18n KF5::KCMUtils) target_link_libraries(kdeconnect-app Qt::Quick Qt::QuickControls2 Qt::Widgets KF5::CoreAddons KF5::I18n KF5::KCMUtils)
install(TARGETS kdeconnect-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS kdeconnect-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(PROGRAMS org.kde.kdeconnect.app.desktop DESTINATION ${KDE_INSTALL_APPDIR}) install(PROGRAMS org.kde.kdeconnect.app.desktop DESTINATION ${KDE_INSTALL_APPDIR})

4
core/CMakeLists.txt
View file

@ -57,11 +57,11 @@ target_include_directories(kdeconnectcore PUBLIC ${PROJECT_SOURCE_DIR})
target_link_libraries(kdeconnectcore target_link_libraries(kdeconnectcore
PUBLIC PUBLIC
Qt5::Network Qt${QT_MAJOR_VERSION}::Network
KF5::CoreAddons KF5::CoreAddons
${Qca_LIBRARY} ${Qca_LIBRARY}
PRIVATE PRIVATE
Qt5::DBus Qt${QT_MAJOR_VERSION}::DBus
KF5::I18n KF5::I18n
KF5::ConfigCore KF5::ConfigCore
) )

2
daemon/CMakeLists.txt
View file

@ -17,7 +17,7 @@ target_link_libraries(kdeconnectd
KF5::Notifications KF5::Notifications
KF5::I18n KF5::I18n
KF5::WindowSystem KF5::WindowSystem
Qt5::Widgets) Qt::Widgets)
ecm_mark_nongui_executable(kdeconnectd) ecm_mark_nongui_executable(kdeconnectd)

2
indicator/CMakeLists.txt
View file

@ -43,7 +43,7 @@ add_executable(kdeconnect-indicator ${indicator_SRCS} ${debug_file_SRCS})
target_include_directories(kdeconnect-indicator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/systray_actions) target_include_directories(kdeconnect-indicator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/systray_actions)
target_link_libraries(kdeconnect-indicator Qt5::Widgets KF5::CoreAddons KF5::I18n KF5::Notifications KF5::DBusAddons KF5::KCMUtils kdeconnectinterfaces kdeconnectcore kdeconnectversion) target_link_libraries(kdeconnect-indicator Qt::Widgets KF5::CoreAddons KF5::I18n KF5::Notifications KF5::DBusAddons KF5::KCMUtils kdeconnectinterfaces kdeconnectcore kdeconnectversion)
if (WIN32) if (WIN32)
add_compile_definitions(QSYSTRAY) add_compile_definitions(QSYSTRAY)

8
interfaces/CMakeLists.txt
View file

@ -2,11 +2,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdeconnect-interfaces\")
function(geninterface source_h output_h) function(geninterface source_h output_h)
set(xml_file ${CMAKE_CURRENT_BINARY_DIR}/${output_h}.xml) set(xml_file ${CMAKE_CURRENT_BINARY_DIR}/${output_h}.xml)
qt5_generate_dbus_interface( ${source_h} ${xml_file}) qt_generate_dbus_interface( ${source_h} ${xml_file})
set_source_files_properties(${xml_file} PROPERTIES NO_NAMESPACE true) set_source_files_properties(${xml_file} PROPERTIES NO_NAMESPACE true)
qt5_add_dbus_interface(libkdeconnect_SRC ${xml_file} ${output_h}) qt_add_dbus_interface(libkdeconnect_SRC ${xml_file} ${output_h})
set(libkdeconnect_SRC ${libkdeconnect_SRC} PARENT_SCOPE) set(libkdeconnect_SRC ${libkdeconnect_SRC} PARENT_SCOPE)
endfunction() endfunction()
@ -69,8 +69,8 @@ generate_export_header(kdeconnectinterfaces EXPORT_FILE_NAME ${CMAKE_CURRENT_BIN
target_link_libraries(kdeconnectinterfaces target_link_libraries(kdeconnectinterfaces
LINK_PUBLIC LINK_PUBLIC
Qt5::Gui Qt${QT_MAJOR_VERSION}::Gui
Qt5::DBus Qt${QT_MAJOR_VERSION}::DBus
KF5::ConfigCore KF5::ConfigCore
LINK_PRIVATE LINK_PRIVATE
kdeconnectcore kdeconnectcore

6
kcm/CMakeLists.txt
View file

@ -7,8 +7,8 @@ ki18n_wrap_ui(kcm_kdeconnect kcm.ui)
kcoreaddons_desktop_to_json(kcm_kdeconnect "kcm_kdeconnect.desktop") kcoreaddons_desktop_to_json(kcm_kdeconnect "kcm_kdeconnect.desktop")
target_link_libraries(kcm_kdeconnect target_link_libraries(kcm_kdeconnect
Qt5::Core Qt::Core
Qt5::Gui Qt::Gui
KF5::I18n KF5::I18n
KF5::KCMUtils KF5::KCMUtils
kdeconnectinterfaces kdeconnectinterfaces
@ -16,4 +16,4 @@ target_link_libraries(kcm_kdeconnect
) )
install(TARGETS kcm_kdeconnect DESTINATION ${KDE_INSTALL_PLUGINDIR}) install(TARGETS kcm_kdeconnect DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES kcm_kdeconnect.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) install(FILES kcm_kdeconnect.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR})

4
kcmplugin/CMakeLists.txt
View file

@ -5,8 +5,8 @@ target_link_libraries(kdeconnectpluginkcm
PUBLIC PUBLIC
kdeconnectcore kdeconnectcore
PRIVATE PRIVATE
Qt5::DBus Qt::DBus
Qt5::Gui Qt::Gui
KF5::I18n KF5::I18n
KF5::ConfigCore KF5::ConfigCore
KF5::KCMUtils KF5::KCMUtils

4
kio/CMakeLists.txt
View file

@ -16,8 +16,8 @@ add_library(kio_kdeconnect MODULE ${kio_kdeconnect_PART_SRCS})
target_link_libraries(kio_kdeconnect target_link_libraries(kio_kdeconnect
kdeconnectinterfaces kdeconnectinterfaces
Qt5::Core Qt::Core
Qt5::Network Qt::Network
KF5::KIOCore KF5::KIOCore
KF5::I18n KF5::I18n
) )

2
plasmoid/CMakeLists.txt
View file

@ -1,5 +1,5 @@
kpackage_install_package(package org.kde.kdeconnect plasmoids plasma NO_DEPRECATED_WARNING) kpackage_install_package(package org.kde.kdeconnect plasmoids plasma NO_DEPRECATED_WARNING)
install(FILES package/metadata.desktop install(FILES package/metadata.desktop
DESTINATION ${KDE_INSTALL_KSERVICES5DIR} DESTINATION ${KDE_INSTALL_KSERVICESDIR}
RENAME plasma-kdeconnect.desktop) RENAME plasma-kdeconnect.desktop)

2
plugins/CMakeLists.txt
View file

@ -62,4 +62,4 @@ endif()
# If we split notifications per plugin, in several notifyrc files, they won't # If we split notifications per plugin, in several notifyrc files, they won't
# appear in the same group in the Notifications KCM # appear in the same group in the Notifications KCM
install(FILES kdeconnect.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR}) install(FILES kdeconnect.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})

2
plugins/battery/CMakeLists.txt
View file

@ -14,7 +14,7 @@ kdeconnect_add_plugin(kdeconnect_battery SOURCES ${kdeconnect_battery_SRCS})
target_link_libraries(kdeconnect_battery target_link_libraries(kdeconnect_battery
kdeconnectcore kdeconnectcore
Qt5::DBus Qt${QT_MAJOR_VERSION}::DBus
KF5::Solid KF5::Solid
KF5::I18n KF5::I18n
) )

2
plugins/bigscreen/CMakeLists.txt
View file

@ -4,4 +4,4 @@ set(kdeconnect_bigscreen_SRCS
kdeconnect_add_plugin(kdeconnect_bigscreen SOURCES ${kdeconnect_bigscreen_SRCS}) kdeconnect_add_plugin(kdeconnect_bigscreen SOURCES ${kdeconnect_bigscreen_SRCS})
target_link_libraries(kdeconnect_bigscreen kdeconnectcore Qt5::DBus KF5::I18n) target_link_libraries(kdeconnect_bigscreen kdeconnectcore Qt${QT_MAJOR_VERSION}::DBus KF5::I18n)

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

@ -14,7 +14,7 @@ kdeconnect_add_plugin(kdeconnect_connectivity_report SOURCES ${kdeconnect_connec
target_link_libraries(kdeconnect_connectivity_report target_link_libraries(kdeconnect_connectivity_report
kdeconnectcore kdeconnectcore
Qt5::DBus Qt${QT_MAJOR_VERSION}::DBus
KF5::Solid KF5::Solid
KF5::I18n KF5::I18n
) )

2
plugins/contacts/CMakeLists.txt
View file

@ -14,5 +14,5 @@ kdeconnect_add_plugin(kdeconnect_contacts SOURCES ${kdeconnect_contacts_SRCS})
target_link_libraries(kdeconnect_contacts target_link_libraries(kdeconnect_contacts
kdeconnectcore kdeconnectcore
Qt5::DBus Qt::DBus
) )

2
plugins/findmyphone/CMakeLists.txt
View file

@ -4,6 +4,6 @@ set(kdeconnect_findmyphone_SRCS
kdeconnect_add_plugin(kdeconnect_findmyphone SOURCES ${kdeconnect_findmyphone_SRCS}) kdeconnect_add_plugin(kdeconnect_findmyphone SOURCES ${kdeconnect_findmyphone_SRCS})
target_link_libraries(kdeconnect_findmyphone kdeconnectcore Qt5::Core Qt5::DBus) target_link_libraries(kdeconnect_findmyphone kdeconnectcore Qt::Core Qt::DBus)

8
plugins/findthisdevice/CMakeLists.txt
View file

@ -15,9 +15,9 @@ kdeconnect_add_plugin(kdeconnect_findthisdevice
target_link_libraries(kdeconnect_findthisdevice target_link_libraries(kdeconnect_findthisdevice
kdeconnectcore kdeconnectcore
Qt5::Core Qt::Core
Qt5::Multimedia Qt::Multimedia
Qt5::DBus Qt::DBus
) )
if (NOT WIN32) if (NOT WIN32)
@ -32,7 +32,7 @@ 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 ${debug_file_SRCS})
target_link_libraries(kdeconnect_findthisdevice_config target_link_libraries(kdeconnect_findthisdevice_config
kdeconnectpluginkcm kdeconnectpluginkcm
Qt5::Multimedia Qt::Multimedia
KF5::I18n KF5::I18n
KF5::CoreAddons KF5::CoreAddons
KF5::ConfigWidgets KF5::ConfigWidgets

6
plugins/lockdevice/CMakeLists.txt
View file

@ -1,5 +1,5 @@
qt5_add_dbus_interface(lockdevice_SRCS org.freedesktop.login1.xml login1dbusinterface) qt_add_dbus_interface(lockdevice_SRCS org.freedesktop.login1.xml login1dbusinterface)
qt5_add_dbus_interface(lockdevice_SRCS org.freedesktop.DBus.Properties.xml propertiesdbusinterface) qt_add_dbus_interface(lockdevice_SRCS org.freedesktop.DBus.Properties.xml propertiesdbusinterface)
set(debug_file_SRCS) set(debug_file_SRCS)
ecm_qt_declare_logging_category( ecm_qt_declare_logging_category(
@ -18,6 +18,6 @@ kdeconnect_add_plugin(kdeconnect_lockdevice SOURCES ${lockdevice_SRCS} ${debug_f
target_link_libraries(kdeconnect_lockdevice target_link_libraries(kdeconnect_lockdevice
kdeconnectcore kdeconnectcore
Qt5::DBus Qt::DBus
KF5::I18n KF5::I18n
) )

26
plugins/mousepad/CMakeLists.txt
View file

@ -9,18 +9,25 @@ if(UNIX AND NOT APPLE)
PURPOSE "Needed for the remote mousepad plugin" PURPOSE "Needed for the remote mousepad plugin"
) )
ecm_add_qtwayland_client_protocol(wayland_SRCS if (QT_MAJOR_VERSION EQUAL "5")
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/fake-input.xml ecm_add_qtwayland_client_protocol(wayland_SRCS
BASENAME fake-input PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/fake-input.xml
) BASENAME fake-input
)
else()
qt6_generate_wayland_protocol_client_sources(kdeconnect_mousepad FILES
${PLASMA_WAYLAND_PROTOCOLS_DIR}/fake-input.xml)
endif()
target_sources(kdeconnect_mousepad PRIVATE ${wayland_SRCS}) target_sources(kdeconnect_mousepad PRIVATE ${wayland_SRCS})
target_link_libraries(kdeconnect_mousepad Wayland::Client Qt5::WaylandClient) target_link_libraries(kdeconnect_mousepad Wayland::Client Qt::WaylandClient)
target_sources(kdeconnect_mousepad PUBLIC waylandremoteinput.cpp) target_sources(kdeconnect_mousepad PUBLIC waylandremoteinput.cpp)
set(HAVE_WAYLAND TRUE) set(HAVE_WAYLAND TRUE)
if (LibFakeKey_FOUND) if (LibFakeKey_FOUND)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras) if (QT_MAJOR_VERSION EQUAL "5")
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras)
endif()
find_package(XTest REQUIRED) find_package(XTest REQUIRED)
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
target_include_directories(kdeconnect_mousepad PRIVATE ${XTEST_INCLUDE_DIRS} ${X11_INCLUDE_DIR} ${LibFakeKey_INCLUDE_DIRS}) target_include_directories(kdeconnect_mousepad PRIVATE ${XTEST_INCLUDE_DIRS} ${X11_INCLUDE_DIR} ${LibFakeKey_INCLUDE_DIRS})
@ -32,7 +39,7 @@ set(HAVE_X11 ${LibFakeKey_FOUND})
set(HAVE_MACOS ${APPLE}) set(HAVE_MACOS ${APPLE})
configure_file(config-mousepad.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-mousepad.h ) configure_file(config-mousepad.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-mousepad.h )
target_link_libraries(kdeconnect_mousepad kdeconnectcore Qt5::Gui KF5::I18n) target_link_libraries(kdeconnect_mousepad kdeconnectcore Qt::Gui KF5::I18n)
if (HAVE_WINDOWS) if (HAVE_WINDOWS)
target_sources(kdeconnect_mousepad PUBLIC windowsremoteinput.cpp) target_sources(kdeconnect_mousepad PUBLIC windowsremoteinput.cpp)
@ -40,7 +47,10 @@ endif()
if(HAVE_X11) if(HAVE_X11)
target_sources(kdeconnect_mousepad PUBLIC x11remoteinput.cpp) target_sources(kdeconnect_mousepad PUBLIC x11remoteinput.cpp)
target_link_libraries(kdeconnect_mousepad Qt5::X11Extras ${X11_LIBRARIES} ${XTEST_LIBRARIES} ${LibFakeKey_LIBRARIES}) if (QT_MAJOR_VERSION EQUAL "5")
target_link_libraries(kdeconnect_mousepad Qt5::X11Extras)
endif()
target_link_libraries(kdeconnect_mousepad ${X11_LIBRARIES} ${XTEST_LIBRARIES} ${LibFakeKey_LIBRARIES})
endif() endif()
if (HAVE_MACOS) if (HAVE_MACOS)

8
plugins/mpriscontrol/CMakeLists.txt
View file

@ -14,9 +14,9 @@ set_source_files_properties(
PROPERTIES PROPERTIES
NO_NAMESPACE ON) NO_NAMESPACE ON)
qt5_add_dbus_interface(kdeconnect_mpriscontrol_SRCS org.freedesktop.DBus.Properties.xml dbusproperties) qt_add_dbus_interface(kdeconnect_mpriscontrol_SRCS org.freedesktop.DBus.Properties.xml dbusproperties)
qt5_add_dbus_interface(kdeconnect_mpriscontrol_SRCS org.mpris.MediaPlayer2.Player.xml mprisplayer) qt_add_dbus_interface(kdeconnect_mpriscontrol_SRCS org.mpris.MediaPlayer2.Player.xml mprisplayer)
qt5_add_dbus_interface(kdeconnect_mpriscontrol_SRCS org.mpris.MediaPlayer2.xml mprisroot) qt_add_dbus_interface(kdeconnect_mpriscontrol_SRCS org.mpris.MediaPlayer2.xml mprisroot)
endif() endif()
@ -33,5 +33,5 @@ if(WIN32)
target_link_libraries(kdeconnect_mpriscontrol kdeconnectcore windowsapp) target_link_libraries(kdeconnect_mpriscontrol kdeconnectcore windowsapp)
target_compile_features(kdeconnect_mpriscontrol PUBLIC cxx_std_17) target_compile_features(kdeconnect_mpriscontrol PUBLIC cxx_std_17)
else() else()
target_link_libraries(kdeconnect_mpriscontrol Qt5::DBus kdeconnectcore) target_link_libraries(kdeconnect_mpriscontrol Qt::DBus kdeconnectcore)
endif() endif()

2
plugins/mprisremote/CMakeLists.txt
View file

@ -9,5 +9,5 @@ kdeconnect_add_plugin(kdeconnect_mprisremote SOURCES mprisremoteplugin.cpp mpris
target_link_libraries(kdeconnect_mprisremote target_link_libraries(kdeconnect_mprisremote
kdeconnectcore kdeconnectcore
Qt5::DBus Qt::DBus
) )

6
plugins/notifications/CMakeLists.txt
View file

@ -18,14 +18,14 @@ kdeconnect_add_plugin(kdeconnect_notifications SOURCES ${kdeconnect_notification
target_link_libraries(kdeconnect_notifications target_link_libraries(kdeconnect_notifications
kdeconnectcore kdeconnectcore
Qt5::DBus Qt::DBus
KF5::Notifications KF5::Notifications
KF5::I18n KF5::I18n
KF5::WindowSystem KF5::WindowSystem
) )
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE AND QT_MAJOR_VERSION EQUAL "5")
target_link_libraries(kdeconnect_notifications target_link_libraries(kdeconnect_notifications
Qt::X11Extras Qt5::X11Extras
) )
endif() endif()

6
plugins/pausemusic/CMakeLists.txt
View file

@ -15,14 +15,14 @@ ecm_qt_declare_logging_category(
DEFAULT_SEVERITY Warning DEFAULT_SEVERITY Warning
EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin pausemusic)") EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin pausemusic)")
qt5_add_dbus_interface(kdeconnect_pausemusic_SRCS org.mpris.MediaPlayer2.Player.xml mprisplayer) qt_add_dbus_interface(kdeconnect_pausemusic_SRCS org.mpris.MediaPlayer2.Player.xml mprisplayer)
kdeconnect_add_plugin(kdeconnect_pausemusic SOURCES ${kdeconnect_pausemusic_SRCS} ${debug_file_SRCS}) kdeconnect_add_plugin(kdeconnect_pausemusic SOURCES ${kdeconnect_pausemusic_SRCS} ${debug_file_SRCS})
target_link_libraries(kdeconnect_pausemusic target_link_libraries(kdeconnect_pausemusic
kdeconnectcore kdeconnectcore
Qt5::Core Qt::Core
Qt5::DBus Qt::DBus
) )
if (NOT WIN32) if (NOT WIN32)
target_link_libraries(kdeconnect_pausemusic target_link_libraries(kdeconnect_pausemusic

2
plugins/photo/CMakeLists.txt
View file

@ -14,5 +14,5 @@ kdeconnect_add_plugin(kdeconnect_photo SOURCES ${kdeconnect_photo_SRCS})
target_link_libraries(kdeconnect_photo target_link_libraries(kdeconnect_photo
kdeconnectcore kdeconnectcore
Qt5::DBus Qt::DBus
) )

2
plugins/ping/CMakeLists.txt
View file

@ -14,6 +14,6 @@ kdeconnect_add_plugin(kdeconnect_ping SOURCES ${kdeconnect_ping_SRCS})
target_link_libraries(kdeconnect_ping target_link_libraries(kdeconnect_ping
kdeconnectcore kdeconnectcore
Qt5::DBus Qt${QT_MAJOR_VERSION}::DBus
KF5::I18n KF5::I18n
) )

4
plugins/presenter/CMakeLists.txt
View file

@ -10,7 +10,7 @@ ecm_qt_declare_logging_category(
kdeconnect_add_plugin(kdeconnect_presenter SOURCES presenterplugin.cpp ${presenter_SRCS} ${debug_file_SRCS}) kdeconnect_add_plugin(kdeconnect_presenter SOURCES presenterplugin.cpp ${presenter_SRCS} ${debug_file_SRCS})
target_link_libraries(kdeconnect_presenter target_link_libraries(kdeconnect_presenter
kdeconnectcore kdeconnectcore
Qt5::DBus Qt${QT_MAJOR_VERSION}::DBus
Qt5::Quick Qt${QT_MAJOR_VERSION}::Quick
KF5::I18n KF5::I18n
) )

2
plugins/remotecommands/CMakeLists.txt
View file

@ -12,5 +12,5 @@ kdeconnect_add_plugin(kdeconnect_remotecommands
target_link_libraries(kdeconnect_remotecommands target_link_libraries(kdeconnect_remotecommands
kdeconnectcore kdeconnectcore
Qt5::DBus Qt${QT_MAJOR_VERSION}::DBus
) )

2
plugins/remotecontrol/CMakeLists.txt
View file

@ -9,6 +9,6 @@ kdeconnect_add_plugin(kdeconnect_remotecontrol SOURCES remotecontrolplugin.cpp $
target_link_libraries(kdeconnect_remotecontrol target_link_libraries(kdeconnect_remotecontrol
kdeconnectcore kdeconnectcore
Qt5::DBus Qt${QT_MAJOR_VERSION}::DBus
KF5::I18n KF5::I18n
) )

2
plugins/remotekeyboard/CMakeLists.txt
View file

@ -10,5 +10,5 @@ kdeconnect_add_plugin(kdeconnect_remotekeyboard
target_link_libraries(kdeconnect_remotekeyboard target_link_libraries(kdeconnect_remotekeyboard
kdeconnectcore kdeconnectcore
Qt5::DBus Qt::DBus
) )

2
plugins/remotesystemvolume/CMakeLists.txt
View file

@ -14,6 +14,6 @@ kdeconnect_add_plugin(kdeconnect_remotesystemvolume SOURCES ${kdeconnect_remotes
target_link_libraries(kdeconnect_remotesystemvolume target_link_libraries(kdeconnect_remotesystemvolume
kdeconnectcore kdeconnectcore
Qt5::DBus Qt${QT_MAJOR_VERSION}::DBus
KF5::I18n KF5::I18n
) )

2
plugins/runcommand/CMakeLists.txt
View file

@ -14,7 +14,7 @@ kdeconnect_add_plugin(kdeconnect_runcommand SOURCES ${kdeconnect_runcommand_SRCS
target_link_libraries(kdeconnect_runcommand target_link_libraries(kdeconnect_runcommand
kdeconnectcore kdeconnectcore
Qt5::DBus Qt${QT_MAJOR_VERSION}::DBus
KF5::KCMUtils KF5::KCMUtils
KF5::I18n) KF5::I18n)

4
plugins/screensaver-inhibit/CMakeLists.txt
View file

@ -10,7 +10,7 @@ else()
set(kdeconnect_screensaver_inhibit_SRCS set(kdeconnect_screensaver_inhibit_SRCS
screensaverinhibitplugin.cpp screensaverinhibitplugin.cpp
) )
qt5_add_dbus_interface(kdeconnect_screensaver_inhibit_SRCS org.freedesktop.ScreenSaver.xml screensaverinterface) qt_add_dbus_interface(kdeconnect_screensaver_inhibit_SRCS org.freedesktop.ScreenSaver.xml screensaverinterface)
endif() endif()
set(debug_file_SRCS) set(debug_file_SRCS)
@ -25,7 +25,7 @@ kdeconnect_add_plugin(kdeconnect_screensaver_inhibit SOURCES ${kdeconnect_screen
target_link_libraries(kdeconnect_screensaver_inhibit kdeconnectcore) target_link_libraries(kdeconnect_screensaver_inhibit kdeconnectcore)
if(NOT APPLE AND NOT WIN32) if(NOT APPLE AND NOT WIN32)
target_link_libraries(kdeconnect_screensaver_inhibit target_link_libraries(kdeconnect_screensaver_inhibit
Qt5::DBus Qt::DBus
KF5::I18n KF5::I18n
) )
endif() endif()

4
plugins/sendnotifications/CMakeLists.txt
View file

@ -25,9 +25,9 @@ kdeconnect_add_plugin(kdeconnect_sendnotifications SOURCES ${kdeconnect_sendnoti
target_link_libraries(kdeconnect_sendnotifications target_link_libraries(kdeconnect_sendnotifications
kdeconnectcore kdeconnectcore
Qt5::DBus Qt::DBus
KF5::I18n KF5::I18n
Qt5::Gui Qt::Gui
KF5::IconThemes KF5::IconThemes
KF5::ConfigCore KF5::ConfigCore
) )

2
plugins/sftp/CMakeLists.txt
View file

@ -25,7 +25,7 @@ kdeconnect_add_plugin(kdeconnect_sftp SOURCES ${kdeconnect_sftp_SRCS} ${debug_fi
target_link_libraries(kdeconnect_sftp target_link_libraries(kdeconnect_sftp
kdeconnectcore kdeconnectcore
Qt5::DBus Qt::DBus
KF5::I18n KF5::I18n
KF5::KIOFileWidgets KF5::KIOFileWidgets
KF5::KIOWidgets KF5::KIOWidgets

2
plugins/share/CMakeLists.txt
View file

@ -14,7 +14,7 @@ kdeconnect_add_plugin(kdeconnect_share SOURCES ${kdeconnect_share_SRCS})
target_link_libraries(kdeconnect_share target_link_libraries(kdeconnect_share
kdeconnectcore kdeconnectcore
Qt5::DBus Qt::DBus
KF5::Notifications KF5::Notifications
KF5::I18n KF5::I18n
KF5::KIOWidgets KF5::KIOWidgets

4
plugins/sms/CMakeLists.txt
View file

@ -23,8 +23,8 @@ kdeconnect_add_plugin(kdeconnect_sms SOURCES ${kdeconnect_sms_SRCS})
target_link_libraries(kdeconnect_sms target_link_libraries(kdeconnect_sms
kdeconnectcore kdeconnectcore
kdeconnectinterfaces kdeconnectinterfaces
Qt5::DBus Qt::DBus
KF5::I18n KF5::I18n
KF5::Notifications KF5::Notifications
Qt5::Widgets Qt::Widgets
) )

6
plugins/systemvolume/CMakeLists.txt
View file

@ -23,7 +23,7 @@ kdeconnect_add_plugin(kdeconnect_systemvolume SOURCES ${kdeconnect_systemvolume_
if(WIN32) if(WIN32)
target_link_libraries(kdeconnect_systemvolume target_link_libraries(kdeconnect_systemvolume
kdeconnectcore kdeconnectcore
Qt5::Core Qt::Core
ole32 ole32
) )
target_sources(kdeconnect_systemvolume target_sources(kdeconnect_systemvolume
@ -32,13 +32,13 @@ if(WIN32)
elseif(APPLE) elseif(APPLE)
target_link_libraries(kdeconnect_systemvolume target_link_libraries(kdeconnect_systemvolume
kdeconnectcore kdeconnectcore
Qt5::Core Qt::Core
"-framework CoreAudio" "-framework CoreAudio"
) )
else() else()
target_link_libraries(kdeconnect_systemvolume target_link_libraries(kdeconnect_systemvolume
kdeconnectcore kdeconnectcore
Qt5::Core Qt::Core
KF5::PulseAudioQt KF5::PulseAudioQt
) )
endif() endif()

2
plugins/telephony/CMakeLists.txt
View file

@ -16,5 +16,5 @@ target_link_libraries(kdeconnect_telephony
kdeconnectcore kdeconnectcore
KF5::I18n KF5::I18n
KF5::Notifications KF5::Notifications
Qt5::DBus Qt::DBus
) )

6
plugins/virtualmonitor/CMakeLists.txt
View file

@ -15,7 +15,7 @@ kdeconnect_add_plugin(kdeconnect_virtualmonitor
target_link_libraries(kdeconnect_virtualmonitor target_link_libraries(kdeconnect_virtualmonitor
kdeconnectcore kdeconnectcore
Qt5::Core Qt::Core
Qt5::Multimedia Qt::Multimedia
Qt5::DBus Qt::DBus
) )

12
smsapp/CMakeLists.txt
View file

@ -28,10 +28,10 @@ target_include_directories(kdeconnectsmshelper PUBLIC ${CMAKE_SOURCE_DIR})
target_link_libraries(kdeconnectsmshelper target_link_libraries(kdeconnectsmshelper
PUBLIC PUBLIC
Qt5::Core Qt::Core
Qt5::DBus Qt::DBus
KF5::People KF5::People
Qt5::Qml Qt::Qml
kdeconnectinterfaces kdeconnectinterfaces
) )
@ -52,9 +52,9 @@ target_link_libraries(kdeconnect-sms
kdeconnectsmshelper kdeconnectsmshelper
kdeconnectinterfaces kdeconnectinterfaces
kdeconnectversion kdeconnectversion
Qt5::Quick Qt::Quick
Qt5::QuickControls2 Qt::QuickControls2
Qt5::Widgets Qt::Widgets
KF5::CoreAddons KF5::CoreAddons
KF5::DBusAddons KF5::DBusAddons
KF5::I18n KF5::I18n

8
tests/CMakeLists.txt
View file

@ -1,12 +1,12 @@
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Test) find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS Test)
set(kdeconnect_libraries set(kdeconnect_libraries
kdeconnectcore kdeconnectcore
kdeconnectversion kdeconnectversion
KF5::I18n KF5::I18n
Qt5::DBus Qt::DBus
Qt5::Network Qt::Network
Qt5::Test Qt::Test
) )
if(${KF5KIO_FOUND}) if(${KF5KIO_FOUND})

2
urlhandler/CMakeLists.txt
View file

@ -9,7 +9,7 @@ target_link_libraries(kdeconnect-handler
kdeconnectinterfaces kdeconnectinterfaces
kdeconnectcore kdeconnectcore
kdeconnectversion kdeconnectversion
Qt5::Widgets Qt::Widgets
KF5::CoreAddons KF5::CoreAddons
KF5::DBusAddons KF5::DBusAddons
KF5::I18n KF5::I18n