Skip to content

GitLab

Commit f0e06fa7 authored by Nicolas Fella's avatar Nicolas Fella
Browse files

Use versionless Qt cmake target 

This makes it easier to build against both Qt5 and Qt6

GIT_SILENT
parent de1f3fc6
Pipeline #49123 passed with stage
in 7 minutes and 27 seconds
Hide whitespace changes
Inline Side-by-side
autotests/client/CMakeLists.txt
View file @ f0e06fa7
......@@ -5,7 +5,7 @@ set( testWaylandOutput_SRCS
test_wayland_output.cpp
)
add_executable(testWaylandOutput ${testWaylandOutput_SRCS})
target_link_libraries( testWaylandOutput Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server)
target_link_libraries( testWaylandOutput Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server)
add_test(NAME kwayland-testWaylandOutput COMMAND testWaylandOutput)
ecm_mark_as_test(testWaylandOutput)
......@@ -16,7 +16,7 @@ set( testWaylandSurface_SRCS
test_wayland_surface.cpp
)
add_executable(testWaylandSurface ${testWaylandSurface_SRCS})
target_link_libraries( testWaylandSurface Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server)
target_link_libraries( testWaylandSurface Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server)
add_test(NAME kwayland-testWaylandSurface COMMAND testWaylandSurface)
ecm_mark_as_test(testWaylandSurface)
......@@ -28,7 +28,7 @@ if (HAVE_LINUX_INPUT_H)
test_wayland_seat.cpp
)
add_executable(testWaylandSeat ${testWaylandSeat_SRCS})
target_link_libraries( testWaylandSeat Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server)
target_link_libraries( testWaylandSeat Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server)
add_test(NAME kwayland-testWaylandSeat COMMAND testWaylandSeat)
ecm_mark_as_test(testWaylandSeat)
endif()
......@@ -40,7 +40,7 @@ set( testShmPool_SRCS
test_shm_pool.cpp
)
add_executable(testShmPool ${testShmPool_SRCS})
target_link_libraries( testShmPool Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testShmPool Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
add_test(NAME kwayland-testShmPool COMMAND testShmPool)
ecm_mark_as_test(testShmPool)
......@@ -51,7 +51,7 @@ set( test_wayland_outputmanagement_SRCS
test_wayland_outputmanagement.cpp
)
add_executable(testWaylandOutputManagement ${test_wayland_outputmanagement_SRCS})
target_link_libraries( testWaylandOutputManagement Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testWaylandOutputManagement Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
add_test(NAME kwayland-testWaylandOutputManagement COMMAND testWaylandOutputManagement)
ecm_mark_as_test(testWaylandOutputManagement)
......@@ -62,7 +62,7 @@ set( test_wayland_outputdevice_SRCS
test_wayland_outputdevice.cpp
)
add_executable(testWaylandOutputDevice ${test_wayland_outputdevice_SRCS})
target_link_libraries( testWaylandOutputDevice Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testWaylandOutputDevice Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
add_test(NAME kwayland-testWaylandOutputDevice COMMAND testWaylandOutputDevice)
ecm_mark_as_test(testWaylandOutputDevice)
......@@ -73,7 +73,7 @@ set( testCompositor_SRCS
test_compositor.cpp
)
add_executable(testCompositor ${testCompositor_SRCS})
target_link_libraries( testCompositor Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testCompositor Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
add_test(NAME kwayland-testCompositor COMMAND testCompositor)
ecm_mark_as_test(testCompositor)
......@@ -84,7 +84,7 @@ set( testSubCompositor_SRCS
test_wayland_subcompositor.cpp
)
add_executable(testSubCompositor ${testSubCompositor_SRCS})
target_link_libraries( testSubCompositor Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testSubCompositor Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
add_test(NAME kwayland-testSubCompositor COMMAND testSubCompositor)
ecm_mark_as_test(testSubCompositor)
......@@ -96,7 +96,7 @@ set( testSubSurface_SRCS
test_wayland_subsurface.cpp
)
add_executable(testSubSurface ${testSubSurface_SRCS})
target_link_libraries( testSubSurface Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testSubSurface Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
add_test(NAME kwayland-testSubSurface COMMAND testSubSurface)
ecm_mark_as_test(testSubSurface)
......@@ -107,7 +107,7 @@ set( testRegion_SRCS
test_wayland_region.cpp
)
add_executable(testRegion ${testRegion_SRCS})
target_link_libraries( testRegion Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testRegion Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
add_test(NAME kwayland-testRegion COMMAND testRegion)
ecm_mark_as_test(testRegion)
......@@ -118,7 +118,7 @@ set( testBlur_SRCS
test_wayland_blur.cpp
)
add_executable(testBlur ${testBlur_SRCS})
target_link_libraries( testBlur Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testBlur Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
add_test(NAME kwayland-testBlur COMMAND testBlur)
ecm_mark_as_test(testBlur)
......@@ -129,7 +129,7 @@ set( testContrast_SRCS
test_wayland_contrast.cpp
)
add_executable(testContrast ${testContrast_SRCS})
target_link_libraries( testContrast Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testContrast Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
add_test(NAME kwayland-testContrast COMMAND testContrast)
ecm_mark_as_test(testContrast)
......@@ -140,7 +140,7 @@ set( testSlide_SRCS
test_wayland_slide.cpp
)
add_executable(testSlide ${testSlide_SRCS})
target_link_libraries( testSlide Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testSlide Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
add_test(NAME kwayland-testSlide COMMAND testSlide)
ecm_mark_as_test(testSlide)
......@@ -151,7 +151,7 @@ set( testWindowmanagement_SRCS
test_wayland_windowmanagement.cpp
)
add_executable(testWindowmanagement ${testWindowmanagement_SRCS})
target_link_libraries( testWindowmanagement Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testWindowmanagement Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
add_test(NAME kwayland-testWindowmanagement COMMAND testWindowmanagement)
ecm_mark_as_test(testWindowmanagement)
......@@ -162,7 +162,7 @@ set( testDataSource_SRCS
test_datasource.cpp
)
add_executable(testDataSource ${testDataSource_SRCS})
target_link_libraries( testDataSource Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testDataSource Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
add_test(NAME kwayland-testDataSource COMMAND testDataSource)
ecm_mark_as_test(testDataSource)
......@@ -173,7 +173,7 @@ set( testDataDevice_SRCS
test_datadevice.cpp
)
add_executable(testDataDevice ${testDataDevice_SRCS})
target_link_libraries( testDataDevice Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testDataDevice Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
add_test(NAME kwayland-testDataDevice COMMAND testDataDevice)
ecm_mark_as_test(testDataDevice)
......@@ -184,7 +184,7 @@ set( testServerSideDecoration_SRCS
test_server_side_decoration.cpp
)
add_executable(testServerSideDecoration ${testServerSideDecoration_SRCS})
target_link_libraries( testServerSideDecoration Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testServerSideDecoration Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
add_test(NAME kwayland-testServerSideDecoration COMMAND testServerSideDecoration)
ecm_mark_as_test(testServerSideDecoration)
......@@ -195,7 +195,7 @@ set( testDragAndDrop_SRCS
test_drag_drop.cpp
)
add_executable(testDragAndDrop ${testDragAndDrop_SRCS})
target_link_libraries( testDragAndDrop Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testDragAndDrop Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
add_test(NAME kwayland-testDragAndDrop COMMAND testDragAndDrop)
ecm_mark_as_test(testDragAndDrop)
......@@ -206,7 +206,7 @@ set( testPlasmaShell_SRCS
test_plasmashell.cpp
)
add_executable(testPlasmaShell ${testPlasmaShell_SRCS})
target_link_libraries( testPlasmaShell Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testPlasmaShell Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
add_test(NAME kwayland-testPlasmaShell COMMAND testPlasmaShell)
ecm_mark_as_test(testPlasmaShell)
......@@ -217,7 +217,7 @@ set( testIdle_SRCS
test_idle.cpp
)
add_executable(testIdle ${testIdle_SRCS})
target_link_libraries( testIdle Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testIdle Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
add_test(NAME kwayland-testIdle COMMAND testIdle)
ecm_mark_as_test(testIdle)
......@@ -228,7 +228,7 @@ set( testShadow_SRCS
test_shadow.cpp
)
add_executable(testShadow ${testShadow_SRCS})
target_link_libraries( testShadow Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testShadow Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
add_test(NAME kwayland-testShadow COMMAND testShadow)
ecm_mark_as_test(testShadow)
......@@ -240,7 +240,7 @@ if (HAVE_LINUX_INPUT_H)
test_fake_input.cpp
)
add_executable(testFakeInput ${testFakeInput_SRCS})
target_link_libraries( testFakeInput Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testFakeInput Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
add_test(NAME kwayland-testFakeInput COMMAND testFakeInput)
ecm_mark_as_test(testFakeInput)
endif()
......@@ -253,7 +253,7 @@ if (HAVE_LINUX_INPUT_H)
test_plasma_window_model.cpp
)
add_executable(testPlasmaWindowModel ${testPlasmaWindowModel_SRCS})
target_link_libraries( testPlasmaWindowModel Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testPlasmaWindowModel Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
add_test(NAME kwayland-testPlasmaWindowModel COMMAND testPlasmaWindowModel)
ecm_mark_as_test(testPlasmaWindowModel)
endif()
......@@ -265,7 +265,7 @@ set( testTextInputV2_SRCS
test_text_input_v2.cpp
)
add_executable(testTextInputV2 ${testTextInputV2_SRCS})
target_link_libraries( testTextInputV2 Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testTextInputV2 Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
add_test(NAME kwayland-testTextInputV2 COMMAND testTextInputV2)
ecm_mark_as_test(testTextInputV2)
......@@ -276,7 +276,7 @@ set( testError_SRCS
test_error.cpp
)
add_executable(testError ${testError_SRCS})
target_link_libraries( testError Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testError Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
add_test(NAME kwayland-testError COMMAND testError)
ecm_mark_as_test(testError)
......@@ -287,7 +287,7 @@ set( testSelection_SRCS
test_selection.cpp
)
add_executable(testSelection ${testSelection_SRCS})
target_link_libraries( testSelection Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testSelection Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
add_test(NAME kwayland-testSelection COMMAND testSelection)
ecm_mark_as_test(testSelection)
......@@ -298,7 +298,7 @@ set( testXdgForeign_SRCS
test_xdg_foreign.cpp
)
add_executable(testXdgForeign ${testXdgForeign_SRCS})
target_link_libraries( testXdgForeign Qt5::Test Qt5::Gui Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
target_link_libraries( testXdgForeign Qt::Test Qt::Gui Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
add_test(NAME kwayland-testXdgForeign COMMAND testXdgForeign)
ecm_mark_as_test(testXdgForeign)
......@@ -307,7 +307,7 @@ ecm_mark_as_test(testXdgForeign)
########################################################
set(testXdgShell_SRCS test_xdg_shell.cpp)
add_executable(testXdgShell ${testXdgShell_SRCS})
target_link_libraries( testXdgShell Qt5::Test Qt5::Gui Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
target_link_libraries( testXdgShell Qt::Test Qt::Gui Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
add_test(NAME kwayland-testXdgShell COMMAND testXdgShell)
ecm_mark_as_test(testXdgShell)
......@@ -315,7 +315,7 @@ ecm_mark_as_test(testXdgShell)
# Test Pointer Constraints
########################################################
add_executable(testPointerConstraints test_pointer_constraints.cpp)
target_link_libraries( testPointerConstraints Qt5::Test Qt5::Gui Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
target_link_libraries( testPointerConstraints Qt::Test Qt::Gui Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
add_test(NAME kwayland-testPointerConstraints COMMAND testPointerConstraints)
ecm_mark_as_test(testPointerConstraints)
......@@ -327,7 +327,7 @@ set( testFilter_SRCS
test_wayland_filter.cpp
)
add_executable(testFilter ${testFilter_SRCS})
target_link_libraries( testFilter Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Server)
target_link_libraries( testFilter Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Server)
add_test(NAME kwayland-testFilter COMMAND testFilter)
ecm_mark_as_test(testFilter)
......@@ -338,7 +338,7 @@ set( testAppmenu_SRCS
test_wayland_appmenu.cpp
)
add_executable(testAppmenu ${testAppmenu_SRCS})
target_link_libraries( testAppmenu Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testAppmenu Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
add_test(NAME kwayland-testAppmenu COMMAND testAppmenu)
ecm_mark_as_test(testAppmenu)
......@@ -349,7 +349,7 @@ set( testServerSideDecorationPalette_SRCS
test_server_side_decoration_palette.cpp
)
add_executable(testServerSideDecorationPalette ${testServerSideDecorationPalette_SRCS})
target_link_libraries( testServerSideDecorationPalette Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testServerSideDecorationPalette Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
add_test(NAME kwayland-testServerSideDecorationPalette COMMAND testServerSideDecorationPalette)
ecm_mark_as_test(testServerSideDecorationPalette)
......@@ -360,7 +360,7 @@ set( testPlasmaVirtualDesktop_SRCS
test_plasma_virtual_desktop.cpp
)
add_executable(testPlasmaVirtualDesktop ${testPlasmaVirtualDesktop_SRCS})
target_link_libraries( testPlasmaVirtualDesktop Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testPlasmaVirtualDesktop Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
add_test(NAME kwayland-testPlasmaVirtualDesktop COMMAND testPlasmaVirtualDesktop)
ecm_mark_as_test(testPlasmaVirtualDesktop)
......@@ -371,7 +371,7 @@ set( testXdgOutput_SRCS
test_xdg_output.cpp
)
add_executable(testXdgOutput ${testXdgOutput_SRCS})
target_link_libraries( testXdgOutput Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server)
target_link_libraries( testXdgOutput Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server)
add_test(NAME kwayland-testXdgOutput COMMAND testXdgOutput)
ecm_mark_as_test(testXdgOutput)
......@@ -382,7 +382,7 @@ set( testXdgdecoration_SRCS
test_xdg_decoration.cpp
)
add_executable(testXdgDecoration ${testXdgdecoration_SRCS})
target_link_libraries( testXdgDecoration Qt5::Test Qt5::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server)
target_link_libraries( testXdgDecoration Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server)
add_test(NAME kwayland-testXdgDecoration COMMAND testXdgDecoration)
ecm_mark_as_test(testXdgDecoration)
autotests/server/CMakeLists.txt
View file @ f0e06fa7
......@@ -5,7 +5,7 @@ set( testWaylandServerDisplay_SRCS
test_display.cpp
)
add_executable(testWaylandServerDisplay ${testWaylandServerDisplay_SRCS})
target_link_libraries( testWaylandServerDisplay Qt5::Test Qt5::Gui Plasma::KWaylandServer Wayland::Server)
target_link_libraries( testWaylandServerDisplay Qt::Test Qt::Gui Plasma::KWaylandServer Wayland::Server)
add_test(NAME kwayland-testWaylandServerDisplay COMMAND testWaylandServerDisplay)
ecm_mark_as_test(testWaylandServerDisplay)
......@@ -16,7 +16,7 @@ set( testWaylandServerSeat_SRCS
test_seat.cpp
)
add_executable(testWaylandServerSeat ${testWaylandServerSeat_SRCS})
target_link_libraries( testWaylandServerSeat Qt5::Test Qt5::Gui Plasma::KWaylandServer Wayland::Server)
target_link_libraries( testWaylandServerSeat Qt::Test Qt::Gui Plasma::KWaylandServer Wayland::Server)
add_test(NAME kwayland-testWaylandServerSeat COMMAND testWaylandServerSeat)
ecm_mark_as_test(testWaylandServerSeat)
......@@ -24,7 +24,7 @@ ecm_mark_as_test(testWaylandServerSeat)
# Test No XDG_RUNTIME_DIR
########################################################
add_executable(testNoXdgRuntimeDir test_no_xdg_runtime_dir.cpp)
target_link_libraries( testNoXdgRuntimeDir Qt5::Test Plasma::KWaylandServer)
target_link_libraries( testNoXdgRuntimeDir Qt::Test Plasma::KWaylandServer)
add_test(NAME kwayland-testNoXdgRuntimeDir COMMAND testNoXdgRuntimeDir)
ecm_mark_as_test(testNoXdgRuntimeDir)
......@@ -36,7 +36,7 @@ ecm_add_qtwayland_client_protocol(TABLET_SRCS
BASENAME tablet-unstable-v2
)
add_executable(testTabletInterface test_tablet_interface.cpp ${TABLET_SRCS})
target_link_libraries( testTabletInterface Qt5::Test Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
target_link_libraries( testTabletInterface Qt::Test Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
add_test(NAME kwayland-testTabletInterface COMMAND testTabletInterface)
ecm_mark_as_test(testTabletInterface)
......@@ -48,7 +48,7 @@ ecm_add_qtwayland_client_protocol(DATACONTROL_SRCS
BASENAME wlr-data-control-unstable-v1
)
add_executable(testDataControlInterface test_datacontrol_interface.cpp ${DATACONTROL_SRCS})
target_link_libraries( testDataControlInterface Qt5::Test Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
target_link_libraries( testDataControlInterface Qt::Test Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
add_test(NAME kwayland-testDataControlInterface COMMAND testDataControlInterface)
ecm_mark_as_test(testDataControlInterface)
......@@ -60,7 +60,7 @@ ecm_add_qtwayland_client_protocol(KEYBOARD_SHORTCUTS_INHIBITOR_SRCS
BASENAME keyboard-shortcuts-inhibit-unstable-v1
)
add_executable(testKeyboardShortcutsInhibitorInterface test_keyboard_shortcuts_inhibitor_interface.cpp ${KEYBOARD_SHORTCUTS_INHIBITOR_SRCS})
target_link_libraries(testKeyboardShortcutsInhibitorInterface Qt5::Test Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
target_link_libraries(testKeyboardShortcutsInhibitorInterface Qt::Test Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
add_test(NAME kwayland-testKeyboardShortcutsInhibitorInterface COMMAND testKeyboardShortcutsInhibitorInterface)
ecm_mark_as_test(testKeyboardShortcutsInhibitorInterface)
......@@ -72,7 +72,7 @@ ecm_add_qtwayland_client_protocol(VIEWPORTER_SRCS
BASENAME viewporter
)
add_executable(testViewporterInterface test_viewporter_interface.cpp ${VIEWPORTER_SRCS})
target_link_libraries(testViewporterInterface Qt5::Test Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
target_link_libraries(testViewporterInterface Qt::Test Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
add_test(NAME kwayland-testViewporterInterface COMMAND testViewporterInterface)
ecm_mark_as_test(testViewporterInterface)
......@@ -84,7 +84,7 @@ ecm_add_qtwayland_client_protocol(SCREENCAST_SRCS
BASENAME zkde-screencast-unstable-v1
)
add_executable(testScreencastV1Interface test_screencast.cpp ${SCREENCAST_SRCS})
target_link_libraries(testScreencastV1Interface Qt5::Test Plasma::KWaylandServer Wayland::Client KF5::WaylandClient)
target_link_libraries(testScreencastV1Interface Qt::Test Plasma::KWaylandServer Wayland::Client KF5::WaylandClient)
add_test(NAME kwayland-testScreencastV1Interface COMMAND testScreencastV1Interface)
ecm_mark_as_test(testScreencastV1Interface)
......@@ -100,7 +100,7 @@ ecm_add_qtwayland_client_protocol(VIEWPORTER_SRCS
BASENAME text-input-unstable-v1
)
add_executable(testInputMethodInterface test_inputmethod_interface.cpp ${INPUTMETHOD_SRCS})
target_link_libraries(testInputMethodInterface Qt5::Test Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
target_link_libraries(testInputMethodInterface Qt::Test Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
add_test(NAME kwayland-testInputMethodInterface COMMAND testInputMethodInterface)
ecm_mark_as_test(testInputMethodInterface)
......@@ -116,7 +116,7 @@ ecm_add_qtwayland_client_protocol(LAYERSHELLV1_SRCS
BASENAME xdg-shell
)
add_executable(testLayerShellV1Interface test_layershellv1_interface.cpp ${LAYERSHELLV1_SRCS})
target_link_libraries(testLayerShellV1Interface Qt5::Test Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
target_link_libraries(testLayerShellV1Interface Qt::Test Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
add_test(NAME kwayland-testLayerShellV1Interface COMMAND testLayerShellV1Interface)
ecm_mark_as_test(testLayerShellV1Interface)
......@@ -129,6 +129,6 @@ ecm_add_qtwayland_client_protocol(TEXTINPUTV3_SRCS
BASENAME text-input-unstable-v3
)
add_executable(testTextInputV3Interface test_textinputv3_interface.cpp ${TEXTINPUTV3_SRCS})
target_link_libraries(testTextInputV3Interface Qt5::Test Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
target_link_libraries(testTextInputV3Interface Qt::Test Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
add_test(NAME kwayland-testTextInputV3Interface COMMAND testTextInputV3Interface)
ecm_mark_as_test(testTextInputV3Interface)
src/server/CMakeLists.txt
View file @ f0e06fa7
......@@ -289,11 +289,11 @@ target_include_directories(KWaylandServer INTERFACE "$<INSTALL_INTERFACE:${KDE_I
target_link_libraries(KWaylandServer
PUBLIC
Qt5::Gui
Qt::Gui
Wayland::Server
PRIVATE
EGL::EGL
Qt5::Concurrent
Qt::Concurrent
)
target_compile_definitions(KWaylandServer PRIVATE
......
src/tools/CMakeLists.txt
View file @ f0e06fa7
remove_definitions(-DQT_NO_CAST_FROM_ASCII)
add_executable(qtwaylandscanner_kde qtwaylandscanner.cpp)
target_link_libraries(qtwaylandscanner_kde Qt5::Core)
target_link_libraries(qtwaylandscanner_kde Qt::Core)
function(ecm_add_qtwayland_server_protocol_kde out_var)
# Parse arguments
......
tests/CMakeLists.txt
View file @ f0e06fa7
......@@ -15,7 +15,7 @@ if (Qt5Widgets_FOUND)
renderingservertest.cpp
)
add_executable(testRenderingServer ${testRenderingServer_SRCS})
target_link_libraries(testRenderingServer Plasma::KWaylandServer Qt5::Concurrent Qt5::Widgets)
target_link_libraries(testRenderingServer Plasma::KWaylandServer Qt::Concurrent Qt::Widgets)
ecm_mark_as_test(testRenderingServer)
endif()
......@@ -24,7 +24,7 @@ target_link_libraries(copyClient KF5::WaylandClient)
ecm_mark_as_test(copyClient)
add_executable(pasteClient pasteclient.cpp)
target_link_libraries(pasteClient Qt5::Concurrent KF5::WaylandClient)
target_link_libraries(pasteClient Qt::Concurrent KF5::WaylandClient)
ecm_mark_as_test(pasteClient)
if (HAVE_LINUX_INPUT_H)
......@@ -37,7 +37,7 @@ if (HAVE_LINUX_INPUT_H)
ecm_mark_as_test(panelTest)
add_executable(subsurface-test subsurfacetest.cpp)
target_link_libraries(subsurface-test Qt5::Core Qt5::Gui KF5::WaylandClient)
target_link_libraries(subsurface-test Qt::Core Qt::Gui KF5::WaylandClient)
ecm_mark_as_test(subsurface-test)
endif()
......@@ -48,19 +48,19 @@ ecm_mark_as_test(shadowTest)
if (Qt5Widgets_FOUND)
add_executable(dpmsTest dpmstest.cpp)
target_link_libraries(dpmsTest KF5::WaylandClient Qt5::Widgets)
target_link_libraries(dpmsTest KF5::WaylandClient Qt::Widgets)
ecm_mark_as_test(dpmsTest)
endif()
add_executable(plasmasurface-test plasmasurfacetest.cpp)
target_link_libraries(plasmasurface-test Qt5::Gui KF5::WaylandClient)
target_link_libraries(plasmasurface-test Qt::Gui KF5::WaylandClient)
ecm_mark_as_test(plasmasurface-test)
add_executable(xdgforeign-test xdgforeigntest.cpp)
target_link_libraries(xdgforeign-test Qt5::Gui KF5::WaylandClient)
target_link_libraries(xdgforeign-test Qt::Gui KF5::WaylandClient)
ecm_mark_as_test(xdgforeign-test)
add_executable(xdg-test xdgtest.cpp)
target_link_libraries(xdg-test Qt5::Gui KF5::WaylandClient)
target_link_libraries(xdg-test Qt::Gui KF5::WaylandClient)
ecm_mark_as_test(xdg-test)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment