Allow building against Qt6/KF6
This commit is contained in:
parent
afad4b335e
commit
c5bfc4a5b0
38 changed files with 116 additions and 112 deletions
|
@ -68,9 +68,9 @@ else()
|
|||
endif()
|
||||
|
||||
if(UNIX AND NOT APPLE)
|
||||
find_package(KF5Package REQUIRED)
|
||||
find_package(KF${QT_MAJOR_VERSION}Package REQUIRED)
|
||||
if (WITH_PULSEAUDIO)
|
||||
find_package(KF5PulseAudioQt)
|
||||
find_package(KF${QT_MAJOR_VERSION}PulseAudioQt)
|
||||
endif()
|
||||
find_package(QtWaylandScanner REQUIRED)
|
||||
find_package(Wayland 1.9 REQUIRED Client)
|
||||
|
@ -96,7 +96,7 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS DBus Qu
|
|||
if (UNIX AND NOT APPLE AND QT_MAJOR_VERSION EQUAL "5")
|
||||
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras)
|
||||
endif()
|
||||
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS ${KF5_REQUIRED_COMPONENTS})
|
||||
find_package(KF${QT_MAJOR_VERSION} ${KF5_MIN_VERSION} REQUIRED COMPONENTS ${KF5_REQUIRED_COMPONENTS})
|
||||
|
||||
if (WIN32)
|
||||
get_filename_component(WINDOWS_KITS_DIR
|
||||
|
@ -111,8 +111,8 @@ add_subdirectory(core)
|
|||
add_subdirectory(plugins)
|
||||
add_subdirectory(interfaces)
|
||||
|
||||
find_package(KF5QQC2DesktopStyle ${KF5_MIN_VERSION} REQUIRED)
|
||||
set_package_properties(KF5QQC2DesktopStyle PROPERTIES TYPE RUNTIME)
|
||||
find_package(KF${QT_MAJOR_VERSION}QQC2DesktopStyle ${KF5_MIN_VERSION} REQUIRED)
|
||||
set_package_properties(KF${QT_MAJOR_VERSION}QQC2DesktopStyle PROPERTIES TYPE RUNTIME)
|
||||
|
||||
add_subdirectory(icons)
|
||||
add_subdirectory(data)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
qt5_add_resources(kdeconnect_SRCS resources.qrc)
|
||||
qt_add_resources(kdeconnect_SRCS resources.qrc)
|
||||
|
||||
qt5_add_resources(kdeconnect_custom_icons_SRCS ${CMAKE_SOURCE_DIR}/icons/custom_icons.qrc)
|
||||
qt_add_resources(kdeconnect_custom_icons_SRCS ${CMAKE_SOURCE_DIR}/icons/custom_icons.qrc)
|
||||
|
||||
ecm_setup_version(${PROJECT_VERSION}
|
||||
VARIABLE_PREFIX KDE_CONNECT
|
||||
|
@ -29,7 +29,7 @@ add_executable(kdeconnect-app
|
|||
${kdeconnect_SRCS}
|
||||
${kdeconnect_custom_icons_SRCS}
|
||||
)
|
||||
target_link_libraries(kdeconnect-app Qt::Quick Qt::QuickControls2 Qt::Widgets KF5::CoreAddons KF5::I18n KF5::KCMUtils)
|
||||
target_link_libraries(kdeconnect-app Qt::Quick Qt::QuickControls2 Qt::Widgets KF${QT_MAJOR_VERSION}::CoreAddons KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::KCMUtils)
|
||||
|
||||
install(TARGETS kdeconnect-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
install(PROGRAMS org.kde.kdeconnect.app.desktop DESTINATION ${KDE_INSTALL_APPDIR})
|
||||
|
|
|
@ -7,8 +7,8 @@ target_link_libraries(kdeconnect-cli
|
|||
kdeconnectinterfaces
|
||||
kdeconnectcore
|
||||
kdeconnectversion
|
||||
KF5::CoreAddons
|
||||
KF5::I18n
|
||||
KF${QT_MAJOR_VERSION}::CoreAddons
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
)
|
||||
|
||||
install(TARGETS kdeconnect-cli ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
|
|
@ -62,20 +62,24 @@ target_include_directories(kdeconnectcore PUBLIC ${PROJECT_SOURCE_DIR})
|
|||
target_link_libraries(kdeconnectcore
|
||||
PUBLIC
|
||||
Qt${QT_MAJOR_VERSION}::Network
|
||||
KF5::CoreAddons
|
||||
KF${QT_MAJOR_VERSION}::CoreAddons
|
||||
${Qca_LIBRARY}
|
||||
KF5::KIOCore
|
||||
KF5::KIOGui
|
||||
KF${QT_MAJOR_VERSION}::KIOCore
|
||||
KF${QT_MAJOR_VERSION}::KIOGui
|
||||
PRIVATE
|
||||
Qt${QT_MAJOR_VERSION}::DBus
|
||||
KF5::I18n
|
||||
KF5::ConfigCore
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::ConfigCore
|
||||
)
|
||||
|
||||
if(WIN32)
|
||||
target_link_libraries(kdeconnectcore PRIVATE ws2_32.lib) # winsock2
|
||||
endif()
|
||||
|
||||
if(KF5KIO_FOUND OR KF6KIO_FOUND)
|
||||
target_link_libraries(kdeconnectcore PUBLIC KF${QT_MAJOR_VERSION}::KIOCore KF${QT_MAJOR_VERSION}::KIOGui)
|
||||
endif()
|
||||
|
||||
if (BLUETOOTH_ENABLED)
|
||||
target_compile_definitions(kdeconnectcore PRIVATE -DKDECONNECT_BLUETOOTH)
|
||||
target_link_libraries(kdeconnectcore PRIVATE Qt5::Bluetooth)
|
||||
|
|
|
@ -7,16 +7,16 @@ ecm_qt_declare_logging_category(
|
|||
DEFAULT_SEVERITY Warning
|
||||
EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (daemon)")
|
||||
|
||||
qt5_add_resources(kdeconnect_custom_icons_SRCS ${CMAKE_SOURCE_DIR}/icons/custom_icons.qrc)
|
||||
qt_add_resources(kdeconnect_custom_icons_SRCS ${CMAKE_SOURCE_DIR}/icons/custom_icons.qrc)
|
||||
|
||||
add_executable(kdeconnectd kdeconnectd.cpp ${kdeconnect_custom_icons_SRCS} ${debug_file_SRCS})
|
||||
target_link_libraries(kdeconnectd
|
||||
kdeconnectcore kdeconnectversion
|
||||
KF5::KIOWidgets
|
||||
KF5::DBusAddons
|
||||
KF5::Notifications
|
||||
KF5::I18n
|
||||
KF5::WindowSystem
|
||||
KF${QT_MAJOR_VERSION}::KIOWidgets
|
||||
KF${QT_MAJOR_VERSION}::DBusAddons
|
||||
KF${QT_MAJOR_VERSION}::Notifications
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::WindowSystem
|
||||
Qt::Widgets)
|
||||
|
||||
ecm_mark_nongui_executable(kdeconnectd)
|
||||
|
|
|
@ -10,8 +10,8 @@ ecm_qt_declare_logging_category(
|
|||
add_library(kdeconnectfileitemaction MODULE sendfileitemaction.cpp ${debug_file_SRCS})
|
||||
target_link_libraries(
|
||||
kdeconnectfileitemaction
|
||||
KF5::KIOWidgets
|
||||
KF5::I18n
|
||||
KF${QT_MAJOR_VERSION}::KIOWidgets
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
kdeconnectinterfaces
|
||||
kdeconnectcore
|
||||
)
|
||||
|
|
|
@ -7,7 +7,7 @@ ecm_qt_declare_logging_category(
|
|||
DEFAULT_SEVERITY Warning
|
||||
EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (indicator)")
|
||||
|
||||
qt5_add_resources(kdeconnect_custom_icons_SRCS ${CMAKE_SOURCE_DIR}/icons/custom_icons.qrc)
|
||||
qt_add_resources(kdeconnect_custom_icons_SRCS ${CMAKE_SOURCE_DIR}/icons/custom_icons.qrc)
|
||||
|
||||
set(indicator_SRCS
|
||||
main.cpp
|
||||
|
@ -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_link_libraries(kdeconnect-indicator Qt::Widgets KF5::CoreAddons KF5::I18n KF5::Notifications KF5::DBusAddons KF5::KCMUtils kdeconnectinterfaces kdeconnectcore kdeconnectversion)
|
||||
target_link_libraries(kdeconnect-indicator Qt::Widgets KF${QT_MAJOR_VERSION}::CoreAddons KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::Notifications KF${QT_MAJOR_VERSION}::DBusAddons KF${QT_MAJOR_VERSION}::KCMUtils kdeconnectinterfaces kdeconnectcore kdeconnectversion)
|
||||
|
||||
if (WIN32)
|
||||
target_link_libraries(kdeconnect-indicator windowsapp)
|
||||
|
|
|
@ -72,12 +72,12 @@ target_link_libraries(kdeconnectinterfaces
|
|||
LINK_PUBLIC
|
||||
Qt${QT_MAJOR_VERSION}::Gui
|
||||
Qt${QT_MAJOR_VERSION}::DBus
|
||||
KF5::ConfigCore
|
||||
KF${QT_MAJOR_VERSION}::ConfigCore
|
||||
LINK_PRIVATE
|
||||
kdeconnectcore
|
||||
KF5::I18n
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
kdeconnectcore
|
||||
KF5::CoreAddons
|
||||
KF${QT_MAJOR_VERSION}::CoreAddons
|
||||
)
|
||||
|
||||
install(TARGETS kdeconnectinterfaces EXPORT kdeconnectLibraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
|
||||
|
|
|
@ -9,8 +9,8 @@ ki18n_wrap_ui(kcm_kdeconnect kcm.ui)
|
|||
target_link_libraries(kcm_kdeconnect
|
||||
Qt::Core
|
||||
Qt::Gui
|
||||
KF5::I18n
|
||||
KF5::KCMUtils
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::KCMUtils
|
||||
kdeconnectinterfaces
|
||||
kdeconnectversion
|
||||
)
|
||||
|
|
|
@ -7,9 +7,9 @@ PUBLIC
|
|||
PRIVATE
|
||||
Qt::DBus
|
||||
Qt::Gui
|
||||
KF5::I18n
|
||||
KF5::ConfigCore
|
||||
KF5::KCMUtils
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::ConfigCore
|
||||
KF${QT_MAJOR_VERSION}::KCMUtils
|
||||
)
|
||||
|
||||
set_target_properties(kdeconnectpluginkcm PROPERTIES
|
||||
|
|
|
@ -18,8 +18,8 @@ target_link_libraries(kio_kdeconnect
|
|||
kdeconnectinterfaces
|
||||
Qt::Core
|
||||
Qt::Network
|
||||
KF5::KIOCore
|
||||
KF5::I18n
|
||||
KF${QT_MAJOR_VERSION}::KIOCore
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
)
|
||||
|
||||
########### install files ###############
|
||||
|
|
|
@ -38,8 +38,8 @@ add_subdirectory(screensaver-inhibit)
|
|||
add_subdirectory(virtualmonitor)
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
||||
find_package(KF5ModemManagerQt ${KF5_MIN_VERSION})
|
||||
if (TARGET KF5::ModemManagerQt)
|
||||
find_package(KF${QT_MAJOR_VERSION}ModemManagerQt ${KF5_MIN_VERSION})
|
||||
if (TARGET KF${QT_MAJOR_VERSION}::ModemManagerQt)
|
||||
add_subdirectory(mmtelephony)
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
@ -15,6 +15,6 @@ kdeconnect_add_plugin(kdeconnect_battery SOURCES ${kdeconnect_battery_SRCS})
|
|||
target_link_libraries(kdeconnect_battery
|
||||
kdeconnectcore
|
||||
Qt${QT_MAJOR_VERSION}::DBus
|
||||
KF5::Solid
|
||||
KF5::I18n
|
||||
KF${QT_MAJOR_VERSION}::Solid
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
)
|
||||
|
|
|
@ -4,4 +4,4 @@ set(kdeconnect_bigscreen_SRCS
|
|||
|
||||
kdeconnect_add_plugin(kdeconnect_bigscreen SOURCES ${kdeconnect_bigscreen_SRCS})
|
||||
|
||||
target_link_libraries(kdeconnect_bigscreen kdeconnectcore Qt${QT_MAJOR_VERSION}::DBus KF5::I18n)
|
||||
target_link_libraries(kdeconnect_bigscreen kdeconnectcore Qt${QT_MAJOR_VERSION}::DBus KF${QT_MAJOR_VERSION}::I18n)
|
||||
|
|
|
@ -15,7 +15,7 @@ set(kdeconnect_clipboard_SRCS
|
|||
kdeconnect_add_plugin(kdeconnect_clipboard SOURCES ${kdeconnect_clipboard_SRCS})
|
||||
|
||||
target_link_libraries(kdeconnect_clipboard kdeconnectcore
|
||||
KF5::GuiAddons
|
||||
KF${QT_MAJOR_VERSION}::GuiAddons
|
||||
Qt${QT_MAJOR_VERSION}::DBus
|
||||
${kdeconnect_clipboard_WL_LINK_LIBS}
|
||||
)
|
||||
|
@ -27,6 +27,6 @@ target_sources(kdeconnect_clipboard_config PRIVATE clipboard_config.cpp ${debug_
|
|||
target_link_libraries( kdeconnect_clipboard_config
|
||||
kdeconnectcore
|
||||
kdeconnectpluginkcm
|
||||
KF5::I18n
|
||||
KF5::KCMUtils
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::KCMUtils
|
||||
)
|
||||
|
|
|
@ -15,6 +15,6 @@ kdeconnect_add_plugin(kdeconnect_connectivity_report SOURCES ${kdeconnect_connec
|
|||
target_link_libraries(kdeconnect_connectivity_report
|
||||
kdeconnectcore
|
||||
Qt${QT_MAJOR_VERSION}::DBus
|
||||
KF5::Solid
|
||||
KF5::I18n
|
||||
KF${QT_MAJOR_VERSION}::Solid
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
)
|
||||
|
|
|
@ -22,7 +22,7 @@ target_link_libraries(kdeconnect_findthisdevice
|
|||
|
||||
if (NOT WIN32)
|
||||
target_link_libraries(kdeconnect_findthisdevice
|
||||
KF5::PulseAudioQt
|
||||
KF${QT_MAJOR_VERSION}::PulseAudioQt
|
||||
)
|
||||
endif()
|
||||
|
||||
|
@ -33,8 +33,8 @@ target_sources(kdeconnect_findthisdevice_config PRIVATE findthisdevice_config.cp
|
|||
target_link_libraries(kdeconnect_findthisdevice_config
|
||||
kdeconnectpluginkcm
|
||||
Qt::Multimedia
|
||||
KF5::I18n
|
||||
KF5::CoreAddons
|
||||
KF5::ConfigWidgets
|
||||
KF5::KIOWidgets # KUrlRequester
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::CoreAddons
|
||||
KF${QT_MAJOR_VERSION}::ConfigWidgets
|
||||
KF${QT_MAJOR_VERSION}::KIOWidgets # KUrlRequester
|
||||
)
|
||||
|
|
|
@ -19,5 +19,5 @@ kdeconnect_add_plugin(kdeconnect_lockdevice SOURCES ${lockdevice_SRCS} ${debug_f
|
|||
target_link_libraries(kdeconnect_lockdevice
|
||||
kdeconnectcore
|
||||
Qt::DBus
|
||||
KF5::I18n
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
)
|
||||
|
|
|
@ -15,6 +15,6 @@ kdeconnect_add_plugin(kdeconnect_mmtelephony SOURCES ${kdeconnect_mmtelephony_SR
|
|||
target_link_libraries(kdeconnect_mmtelephony
|
||||
kdeconnectcore
|
||||
Qt${QT_MAJOR_VERSION}::DBus
|
||||
KF5::ModemManagerQt
|
||||
KF5::I18n
|
||||
KF${QT_MAJOR_VERSION}::ModemManagerQt
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
kdeconnect_add_plugin(kdeconnect_mousepad SOURCES mousepadplugin.cpp abstractremoteinput.cpp)
|
||||
|
||||
if(UNIX AND NOT APPLE)
|
||||
qt5_add_dbus_interface(
|
||||
qt_add_dbus_interface(
|
||||
SRCS
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/xdp_dbus_remotedesktop_interface.xml
|
||||
xdp_dbus_remotedesktop_interface
|
||||
|
@ -32,7 +32,7 @@ endif()
|
|||
|
||||
configure_file(config-mousepad.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-mousepad.h)
|
||||
|
||||
target_link_libraries(kdeconnect_mousepad kdeconnectcore Qt::Gui KF5::I18n)
|
||||
target_link_libraries(kdeconnect_mousepad kdeconnectcore Qt::Gui KF${QT_MAJOR_VERSION}::I18n)
|
||||
|
||||
if (WIN32)
|
||||
target_sources(kdeconnect_mousepad PUBLIC windowsremoteinput.cpp)
|
||||
|
|
|
@ -19,9 +19,9 @@ kdeconnect_add_plugin(kdeconnect_notifications SOURCES ${kdeconnect_notification
|
|||
target_link_libraries(kdeconnect_notifications
|
||||
kdeconnectcore
|
||||
Qt::DBus
|
||||
KF5::Notifications
|
||||
KF5::I18n
|
||||
KF5::WindowSystem
|
||||
KF${QT_MAJOR_VERSION}::Notifications
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::WindowSystem
|
||||
)
|
||||
|
||||
if (UNIX AND NOT APPLE AND QT_MAJOR_VERSION EQUAL "5")
|
||||
|
|
|
@ -26,7 +26,7 @@ target_link_libraries(kdeconnect_pausemusic
|
|||
)
|
||||
if (NOT WIN32)
|
||||
target_link_libraries(kdeconnect_pausemusic
|
||||
KF5::PulseAudioQt
|
||||
KF${QT_MAJOR_VERSION}::PulseAudioQt
|
||||
)
|
||||
else()
|
||||
target_link_libraries(kdeconnect_pausemusic
|
||||
|
@ -47,6 +47,6 @@ ki18n_wrap_ui(kdeconnect_pausemusic_config pausemusic_config.ui)
|
|||
target_link_libraries( kdeconnect_pausemusic_config
|
||||
kdeconnectcore
|
||||
kdeconnectpluginkcm
|
||||
KF5::I18n
|
||||
KF5::KCMUtils
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::KCMUtils
|
||||
)
|
||||
|
|
|
@ -15,5 +15,5 @@ kdeconnect_add_plugin(kdeconnect_ping SOURCES ${kdeconnect_ping_SRCS})
|
|||
target_link_libraries(kdeconnect_ping
|
||||
kdeconnectcore
|
||||
Qt${QT_MAJOR_VERSION}::DBus
|
||||
KF5::I18n
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
qt5_add_resources(presenter_SRCS assets.qrc)
|
||||
qt_add_resources(presenter_SRCS assets.qrc)
|
||||
|
||||
set(debug_file_SRCS)
|
||||
ecm_qt_declare_logging_category(
|
||||
|
@ -12,5 +12,5 @@ target_link_libraries(kdeconnect_presenter
|
|||
kdeconnectcore
|
||||
Qt${QT_MAJOR_VERSION}::DBus
|
||||
Qt${QT_MAJOR_VERSION}::Quick
|
||||
KF5::I18n
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
)
|
||||
|
|
|
@ -10,5 +10,5 @@ kdeconnect_add_plugin(kdeconnect_remotecontrol SOURCES remotecontrolplugin.cpp $
|
|||
target_link_libraries(kdeconnect_remotecontrol
|
||||
kdeconnectcore
|
||||
Qt${QT_MAJOR_VERSION}::DBus
|
||||
KF5::I18n
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
)
|
||||
|
|
|
@ -15,5 +15,5 @@ kdeconnect_add_plugin(kdeconnect_remotesystemvolume SOURCES ${kdeconnect_remotes
|
|||
target_link_libraries(kdeconnect_remotesystemvolume
|
||||
kdeconnectcore
|
||||
Qt${QT_MAJOR_VERSION}::DBus
|
||||
KF5::I18n
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
)
|
||||
|
|
|
@ -15,15 +15,15 @@ kdeconnect_add_plugin(kdeconnect_runcommand SOURCES ${kdeconnect_runcommand_SRCS
|
|||
target_link_libraries(kdeconnect_runcommand
|
||||
kdeconnectcore
|
||||
Qt${QT_MAJOR_VERSION}::DBus
|
||||
KF5::KCMUtils
|
||||
KF5::I18n)
|
||||
KF${QT_MAJOR_VERSION}::KCMUtils
|
||||
KF${QT_MAJOR_VERSION}::I18n)
|
||||
|
||||
#----------------------
|
||||
kcoreaddons_add_plugin(kdeconnect_runcommand_config SOURCES runcommand_config.cpp INSTALL_NAMESPACE "kdeconnect/kcms")
|
||||
target_link_libraries( kdeconnect_runcommand_config
|
||||
kdeconnectcore
|
||||
kdeconnectpluginkcm
|
||||
KF5::I18n
|
||||
KF5::CoreAddons
|
||||
KF5::ConfigWidgets
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::CoreAddons
|
||||
KF${QT_MAJOR_VERSION}::ConfigWidgets
|
||||
)
|
||||
|
|
|
@ -26,7 +26,7 @@ target_link_libraries(kdeconnect_screensaver_inhibit kdeconnectcore)
|
|||
if(NOT APPLE AND NOT WIN32)
|
||||
target_link_libraries(kdeconnect_screensaver_inhibit
|
||||
Qt::DBus
|
||||
KF5::I18n
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
)
|
||||
endif()
|
||||
|
||||
|
|
|
@ -18,10 +18,10 @@ kdeconnect_add_plugin(kdeconnect_sendnotifications SOURCES ${kdeconnect_sendnoti
|
|||
target_link_libraries(kdeconnect_sendnotifications
|
||||
kdeconnectcore
|
||||
Qt::DBus
|
||||
KF5::I18n
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
Qt::Gui
|
||||
KF5::IconThemes
|
||||
KF5::ConfigCore
|
||||
KF${QT_MAJOR_VERSION}::IconThemes
|
||||
KF${QT_MAJOR_VERSION}::ConfigCore
|
||||
PkgConfig::GIO
|
||||
)
|
||||
|
||||
|
@ -40,6 +40,6 @@ target_sources(kdeconnect_sendnotifications_config PRIVATE
|
|||
target_link_libraries( kdeconnect_sendnotifications_config
|
||||
kdeconnectcore
|
||||
kdeconnectpluginkcm
|
||||
KF5::I18n
|
||||
KF5::KCMUtils
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::KCMUtils
|
||||
)
|
||||
|
|
|
@ -26,8 +26,8 @@ kdeconnect_add_plugin(kdeconnect_sftp SOURCES ${kdeconnect_sftp_SRCS} ${debug_fi
|
|||
target_link_libraries(kdeconnect_sftp
|
||||
kdeconnectcore
|
||||
Qt::DBus
|
||||
KF5::I18n
|
||||
KF5::KIOFileWidgets
|
||||
KF5::KIOWidgets
|
||||
KF5::Notifications
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::KIOFileWidgets
|
||||
KF${QT_MAJOR_VERSION}::KIOWidgets
|
||||
KF${QT_MAJOR_VERSION}::Notifications
|
||||
)
|
||||
|
|
|
@ -18,11 +18,11 @@ kdeconnect_add_plugin(kdeconnect_share SOURCES ${kdeconnect_share_SRCS})
|
|||
target_link_libraries(kdeconnect_share
|
||||
kdeconnectcore
|
||||
Qt::DBus
|
||||
KF5::Notifications
|
||||
KF5::I18n
|
||||
KF5::GuiAddons
|
||||
KF5::KIOWidgets
|
||||
KF5::Service
|
||||
KF${QT_MAJOR_VERSION}::Notifications
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::GuiAddons
|
||||
KF${QT_MAJOR_VERSION}::KIOWidgets
|
||||
KF${QT_MAJOR_VERSION}::Service
|
||||
)
|
||||
|
||||
#######################################
|
||||
|
@ -33,9 +33,9 @@ kcoreaddons_add_plugin(kdeconnect_share_config SOURCES share_config.cpp INSTALL_
|
|||
ki18n_wrap_ui(kdeconnect_share_config share_config.ui)
|
||||
target_link_libraries(kdeconnect_share_config
|
||||
kdeconnectpluginkcm
|
||||
KF5::I18n
|
||||
KF5::CoreAddons
|
||||
KF5::ConfigWidgets
|
||||
KF5::KIOWidgets
|
||||
KF5::Notifications
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::CoreAddons
|
||||
KF${QT_MAJOR_VERSION}::ConfigWidgets
|
||||
KF${QT_MAJOR_VERSION}::KIOWidgets
|
||||
KF${QT_MAJOR_VERSION}::Notifications
|
||||
)
|
||||
|
|
|
@ -24,7 +24,7 @@ target_link_libraries(kdeconnect_sms
|
|||
kdeconnectcore
|
||||
kdeconnectinterfaces
|
||||
Qt::DBus
|
||||
KF5::I18n
|
||||
KF5::Notifications
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::Notifications
|
||||
Qt::Widgets
|
||||
)
|
||||
|
|
|
@ -39,6 +39,6 @@ else()
|
|||
target_link_libraries(kdeconnect_systemvolume
|
||||
kdeconnectcore
|
||||
Qt::Core
|
||||
KF5::PulseAudioQt
|
||||
KF${QT_MAJOR_VERSION}::PulseAudioQt
|
||||
)
|
||||
endif()
|
||||
|
|
|
@ -14,7 +14,7 @@ kdeconnect_add_plugin(kdeconnect_telephony SOURCES ${kdeconnect_telephony_SRCS})
|
|||
|
||||
target_link_libraries(kdeconnect_telephony
|
||||
kdeconnectcore
|
||||
KF5::I18n
|
||||
KF5::Notifications
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::Notifications
|
||||
Qt::DBus
|
||||
)
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-settings")
|
||||
|
||||
qt5_add_resources(kdeconnect_custom_icons_SRCS ${CMAKE_SOURCE_DIR}/icons/custom_icons.qrc)
|
||||
qt_add_resources(kdeconnect_custom_icons_SRCS ${CMAKE_SOURCE_DIR}/icons/custom_icons.qrc)
|
||||
|
||||
add_executable(kdeconnect-settings
|
||||
main.cpp
|
||||
${kdeconnect_custom_icons_SRCS}
|
||||
)
|
||||
|
||||
target_link_libraries(kdeconnect-settings kdeconnectversion KF5::I18n KF5::KCMUtils KF5::DBusAddons KF5::WindowSystem)
|
||||
target_link_libraries(kdeconnect-settings kdeconnectversion KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::KCMUtils KF${QT_MAJOR_VERSION}::DBusAddons KF${QT_MAJOR_VERSION}::WindowSystem)
|
||||
|
||||
install(TARGETS kdeconnect-settings ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
install(FILES org.kde.kdeconnect-settings.desktop DESTINATION ${KDE_INSTALL_APPDIR})
|
||||
|
|
|
@ -30,12 +30,12 @@ target_link_libraries(kdeconnectsmshelper
|
|||
PUBLIC
|
||||
Qt::Core
|
||||
Qt::DBus
|
||||
KF5::People
|
||||
KF${QT_MAJOR_VERSION}::People
|
||||
Qt::Qml
|
||||
kdeconnectinterfaces
|
||||
)
|
||||
|
||||
qt5_add_resources(kdeconnect_custom_icons_SRCS ${CMAKE_SOURCE_DIR}/icons/custom_icons.qrc)
|
||||
qt_add_resources(kdeconnect_custom_icons_SRCS ${CMAKE_SOURCE_DIR}/icons/custom_icons.qrc)
|
||||
|
||||
add_executable(kdeconnect-sms
|
||||
main.cpp
|
||||
|
@ -55,11 +55,11 @@ target_link_libraries(kdeconnect-sms
|
|||
Qt::Quick
|
||||
Qt::QuickControls2
|
||||
Qt::Widgets
|
||||
KF5::CoreAddons
|
||||
KF5::DBusAddons
|
||||
KF5::I18n
|
||||
KF5::People
|
||||
KF5::KCMUtils
|
||||
KF${QT_MAJOR_VERSION}::CoreAddons
|
||||
KF${QT_MAJOR_VERSION}::DBusAddons
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::People
|
||||
KF${QT_MAJOR_VERSION}::KCMUtils
|
||||
)
|
||||
|
||||
install(TARGETS kdeconnect-sms ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
|
|
@ -3,8 +3,8 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS Test)
|
|||
set(kdeconnect_libraries
|
||||
kdeconnectcore
|
||||
kdeconnectversion
|
||||
KF5::I18n
|
||||
KF5::KIOWidgets
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::KIOWidgets
|
||||
Qt::DBus
|
||||
Qt::Network
|
||||
Qt::Test
|
||||
|
|
|
@ -2,7 +2,7 @@ add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-urlhandler")
|
|||
|
||||
ki18n_wrap_ui(telhandler_SRCS dialog.ui)
|
||||
|
||||
qt5_add_resources(kdeconnect_custom_icons_SRCS ${CMAKE_SOURCE_DIR}/icons/custom_icons.qrc)
|
||||
qt_add_resources(kdeconnect_custom_icons_SRCS ${CMAKE_SOURCE_DIR}/icons/custom_icons.qrc)
|
||||
|
||||
add_executable(kdeconnect-handler kdeconnect-handler.cpp ${telhandler_SRCS} ${kdeconnect_custom_icons_SRCS})
|
||||
|
||||
|
@ -12,10 +12,10 @@ target_link_libraries(kdeconnect-handler
|
|||
kdeconnectcore
|
||||
kdeconnectversion
|
||||
Qt::Widgets
|
||||
KF5::CoreAddons
|
||||
KF5::DBusAddons
|
||||
KF5::I18n
|
||||
KF5::KIOCore KF5::KIOFileWidgets KF5::KIOWidgets
|
||||
KF${QT_MAJOR_VERSION}::CoreAddons
|
||||
KF${QT_MAJOR_VERSION}::DBusAddons
|
||||
KF${QT_MAJOR_VERSION}::I18n
|
||||
KF${QT_MAJOR_VERSION}::KIOCore KF${QT_MAJOR_VERSION}::KIOFileWidgets KF${QT_MAJOR_VERSION}::KIOWidgets
|
||||
)
|
||||
|
||||
install(TARGETS kdeconnect-handler ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
|
Loading…
Reference in a new issue