Ark/krfb
1
0
Fork 0
mirror of https://github.com/KDE/krfb synced 2026-07-01 07:41:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

Adapt build system for building against Qt6

Browse Source
This commit is contained in:
Nicolas Fella
2022-08-03 21:19:35 +02:00
parent 4753904c13
commit 990d5c341a
6 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@@ -27,9 +27,9 @@ include(CheckIncludeFile)
check_include_file("linux/input.h" HAVE_LINUX_INPUT_H)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets X11Extras)
find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
find_package(KF6 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
I18n
Config
CoreAddons
@@ -42,6 +42,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
WidgetsAddons
WindowSystem
XmlGui
StatusNotifierItem
)
find_package(X11 REQUIRED)
@@ -79,10 +80,10 @@ add_feature_info(PipeWire KPipeWire_FOUND "Required for pipewire screencast plug
find_package(PlasmaWaylandProtocols 1.5.0)
if(KPipeWire_FOUND AND PlasmaWaylandProtocols_FOUND)
find_package(KF5Wayland ${KF5_MIN_VERSION})
find_package(KWayland REQUIRED)
find_package(QtWaylandScanner REQUIRED)
find_package(Qt5WaylandClient)
find_package(Qt5XkbCommonSupport)
find_package(Qt6WaylandClient)
find_package(Qt6XkbCommonSupport)
find_package(Wayland REQUIRED COMPONENTS Client)
endif()

2
events/x11/CMakeLists.txt
View File

@@ -11,7 +11,7 @@ add_library (krfb_events_x11 MODULE ${krfb_events_x11_SRCS})
target_link_libraries (krfb_events_x11
${X11_XTest_LIB}
KF5::CoreAddons
KF6::CoreAddons
krfbprivate
)
set_target_properties(krfb_events_x11 PROPERTIES OUTPUT_NAME x11)

8
events/xdp/CMakeLists.txt
View File

@@ -7,7 +7,7 @@ set (krfb_events_xdp_SRCS
xdpeventsplugin.cpp
)
qt5_add_dbus_interface(
qt_add_dbus_interface(
krfb_events_xdp_SRCS
${CMAKE_SOURCE_DIR}/dbus/xdp_dbus_remotedesktop_interface.xml
xdp_dbus_remotedesktop_interface
@@ -16,9 +16,9 @@ qt5_add_dbus_interface(
add_library (krfb_events_xdp MODULE ${krfb_events_xdp_SRCS})
target_link_libraries (krfb_events_xdp
KF5::CoreAddons
KF5::I18n
Qt5::DBus
KF6::CoreAddons
KF6::I18n
Qt::DBus
krfbprivate
)
set_target_properties(krfb_events_xdp PROPERTIES OUTPUT_NAME xdp)

14
framebuffers/pipewire/CMakeLists.txt
View File

@@ -22,13 +22,13 @@ ecm_qt_declare_logging_category(krfb_framebuffer_pw_SRCS
EXPORT KRFB
)
qt5_add_dbus_interface(
qt_add_dbus_interface(
krfb_framebuffer_pw_SRCS
${CMAKE_SOURCE_DIR}/dbus/xdp_dbus_screencast_interface.xml
xdp_dbus_screencast_interface
)
qt5_add_dbus_interface(
qt_add_dbus_interface(
krfb_framebuffer_pw_SRCS
${CMAKE_SOURCE_DIR}/dbus/xdp_dbus_remotedesktop_interface.xml
xdp_dbus_remotedesktop_interface
@@ -41,11 +41,11 @@ add_library(krfb_framebuffer_pw
set_property(TARGET krfb_framebuffer_pw PROPERTY C_STANDARD 99)
target_link_libraries(krfb_framebuffer_pw
Qt5::Core
Qt5::Gui
Qt5::DBus
KF5::CoreAddons
KF5::WaylandClient
Qt::Core
Qt::Gui
Qt::DBus
KF6::CoreAddons
Plasma::KWaylandClient
Wayland::Client
krfbprivate
K::KPipeWire

6
framebuffers/xcb/CMakeLists.txt
View File

@@ -18,8 +18,8 @@ ecm_qt_declare_logging_category(krfb_framebuffer_xcb_SRCS
add_library(krfb_framebuffer_xcb MODULE ${krfb_framebuffer_xcb_SRCS})
target_link_libraries (krfb_framebuffer_xcb
Qt5::Core
Qt5::Gui
Qt::Core
Qt::Gui
Qt::GuiPrivate
XCB::XCB
XCB::RENDER
@@ -28,7 +28,7 @@ target_link_libraries (krfb_framebuffer_xcb
XCB::DAMAGE
XCB::SHM
XCB::IMAGE
KF5::CoreAddons
KF6::CoreAddons
krfbprivate
)

43
krfb/CMakeLists.txt
View File

@@ -23,9 +23,9 @@ generate_export_header(krfbprivate BASE_NAME krfbprivate)
target_link_libraries (krfbprivate
Qt5::Core
Qt5::Widgets
Qt5::X11Extras
Qt::Core
Qt::Widgets
Qt::GuiPrivate
${X11_X11_LIB}
${LIBVNCSERVER_LIBRARIES}
)
@@ -80,7 +80,7 @@ ki18n_wrap_ui (krfb_UI_SRCS
ui/mainwidget.ui
)
qt5_add_resources(krfb_SRCS
qt_add_resources(krfb_SRCS
krfb.qrc
)
@@ -95,16 +95,17 @@ target_link_libraries (krfb
${X11_Xext_LIB}
${X11_X11_LIB}
${X11_Xdamage_LIB}
Qt5::Network
KF5::CoreAddons
KF5::DBusAddons
KF5::DNSSD
KF5::I18n
KF5::Notifications
KF5::Wallet
KF5::WidgetsAddons
KF5::WindowSystem
KF5::XmlGui
Qt::Network
KF6::CoreAddons
KF6::DBusAddons
KF6::DNSSD
KF6::I18n
KF6::Notifications
KF6::Wallet
KF6::WidgetsAddons
KF6::WindowSystem
KF6::XmlGui
KF6::StatusNotifierItem
${LIBVNCSERVER_LIBRARIES}
)
@@ -135,13 +136,13 @@ add_executable(krfb-virtualmonitor main-virtualmonitor.cpp ${krfbvm_SRCS} ${krfb
rfbserver.cpp rfbclient.cpp rfbservermanager.cpp eventsmanager.cpp framebuffermanager.cpp sockethelpers.cpp)
target_link_libraries(krfb-virtualmonitor
krfbprivate
Qt5::Gui
Qt5::Network
KF5::ConfigGui
KF5::CoreAddons
KF5::I18n
KF5::Notifications
KF5::WindowSystem
Qt::Gui
Qt::Network
KF6::ConfigGui
KF6::CoreAddons
KF6::I18n
KF6::Notifications
KF6::WindowSystem
)
install (TARGETS krfb-virtualmonitor