Add a build system
Framework style build system which generates two libraries: * KF5WaylandClient * KF5WaylandServer autotests are adjusted to compile again. They need to be changed to use the libraries once the export header gets generated.
This commit is contained in:
parent
2dbf5e95cf
commit
e763d9acc0
14 changed files with 174 additions and 142 deletions
17
src/wayland/CMakeLists.txt
Normal file
17
src/wayland/CMakeLists.txt
Normal file
|
@ -0,0 +1,17 @@
|
|||
set(SERVER_LIB_SRCS
|
||||
buffer_interface.cpp
|
||||
compositor_interface.cpp
|
||||
display.cpp
|
||||
output_interface.cpp
|
||||
seat_interface.cpp
|
||||
shell_interface.cpp
|
||||
surface_interface.cpp
|
||||
)
|
||||
|
||||
add_library(KF5WaylandServer ${SERVER_LIB_SRCS})
|
||||
add_library(KF5::WaylandServer ALIAS KF5WaylandServer)
|
||||
|
||||
target_link_libraries(KF5WaylandServer
|
||||
PUBLIC Qt5::Gui
|
||||
PRIVATE Wayland::Server
|
||||
)
|
5
src/wayland/KF5WaylandConfig.cmake.in
Normal file
5
src/wayland/KF5WaylandConfig.cmake.in
Normal file
|
@ -0,0 +1,5 @@
|
|||
@PACKAGE_INIT@
|
||||
|
||||
find_dependency(Qt5Gui @REQUIRED_QT_VERSION@)
|
||||
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/KF5WaylandTargets.cmake")
|
10
src/wayland/autotests/CMakeLists.txt
Normal file
10
src/wayland/autotests/CMakeLists.txt
Normal file
|
@ -0,0 +1,10 @@
|
|||
include(ECMMarkAsTest)
|
||||
|
||||
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test)
|
||||
|
||||
remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
|
||||
remove_definitions(-DQT_NO_CAST_FROM_ASCII)
|
||||
remove_definitions(-DQT_NO_CAST_TO_ASCII)
|
||||
|
||||
add_subdirectory(client)
|
||||
add_subdirectory(server)
|
|
@ -5,14 +5,14 @@ set_source_files_properties(${CMAKE_BINARY_DIR}/wayland_protocols/wayland-client
|
|||
########################################################
|
||||
set( testWaylandConnectionThread_SRCS
|
||||
test_wayland_connection_thread.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/buffer_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/connection_thread.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/compositor_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/display.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/output_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/seat_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/shell_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/surface_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/buffer_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/connection_thread.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/compositor_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/display.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/output_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/seat_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/shell_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/surface_interface.cpp
|
||||
)
|
||||
add_executable(testWaylandConnectionThread ${testWaylandConnectionThread_SRCS})
|
||||
target_link_libraries( testWaylandConnectionThread Qt5::Test Qt5::Gui Wayland::Client Wayland::Server)
|
||||
|
@ -24,16 +24,16 @@ ecm_mark_as_test(testWaylandConnectionThread)
|
|||
########################################################
|
||||
set( testWaylandRegistry_SRCS
|
||||
test_wayland_registry.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/connection_thread.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/registry.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/connection_thread.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/registry.cpp
|
||||
${CMAKE_BINARY_DIR}/wayland_protocols/wayland-client-fullscreen-shell.c
|
||||
${KWIN_SOURCE_DIR}/wayland_server/buffer_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/compositor_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/display.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/output_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/seat_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/shell_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/surface_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/buffer_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/compositor_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/display.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/output_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/seat_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/shell_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/surface_interface.cpp
|
||||
)
|
||||
add_executable(testWaylandRegistry ${testWaylandRegistry_SRCS})
|
||||
add_dependencies(testWaylandRegistry wayland-client-fullscreen-shell)
|
||||
|
@ -47,9 +47,9 @@ ecm_mark_as_test(testWaylandRegistry)
|
|||
if(Wayland_VERSION VERSION_GREATER "1.4.0")
|
||||
set( testWaylandFullscreenShell_SRCS
|
||||
test_wayland_fullscreen_shell.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/connection_thread.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/registry.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/fullscreen_shell.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/connection_thread.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/registry.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/fullscreen_shell.cpp
|
||||
${CMAKE_BINARY_DIR}/wayland_protocols/wayland-client-fullscreen-shell.c
|
||||
)
|
||||
add_executable(testWaylandFullscreenShell ${testWaylandFullscreenShell_SRCS})
|
||||
|
@ -64,18 +64,18 @@ endif()
|
|||
########################################################
|
||||
set( testWaylandOutput_SRCS
|
||||
test_wayland_output.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/connection_thread.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/registry.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/fullscreen_shell.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/output.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/connection_thread.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/registry.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/fullscreen_shell.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/output.cpp
|
||||
${CMAKE_BINARY_DIR}/wayland_protocols/wayland-client-fullscreen-shell.c
|
||||
${KWIN_SOURCE_DIR}/wayland_server/buffer_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/compositor_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/display.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/output_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/seat_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/shell_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/surface_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/buffer_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/compositor_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/display.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/output_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/seat_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/shell_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/surface_interface.cpp
|
||||
)
|
||||
add_executable(testWaylandOutput ${testWaylandOutput_SRCS})
|
||||
add_dependencies(testWaylandOutput wayland-client-fullscreen-shell)
|
||||
|
@ -88,20 +88,20 @@ ecm_mark_as_test(testWaylandOutput)
|
|||
########################################################
|
||||
set( testWaylandShell_SRCS
|
||||
test_wayland_shell.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/compositor.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/connection_thread.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/registry.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/fullscreen_shell.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/shell.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/surface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/compositor.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/connection_thread.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/registry.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/fullscreen_shell.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/shell.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/surface.cpp
|
||||
${CMAKE_BINARY_DIR}/wayland_protocols/wayland-client-fullscreen-shell.c
|
||||
${KWIN_SOURCE_DIR}/wayland_server/buffer_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/compositor_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/display.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/output_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/seat_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/shell_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/surface_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/buffer_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/compositor_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/display.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/output_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/seat_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/shell_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/surface_interface.cpp
|
||||
)
|
||||
add_executable(testWaylandShell ${testWaylandShell_SRCS})
|
||||
add_dependencies(testWaylandShell wayland-client-fullscreen-shell)
|
||||
|
@ -114,21 +114,21 @@ ecm_mark_as_test(testWaylandShell)
|
|||
########################################################
|
||||
set( testWaylandSurface_SRCS
|
||||
test_wayland_surface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/buffer.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/compositor.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/connection_thread.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/registry.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/fullscreen_shell.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/shm_pool.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/surface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/buffer.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/compositor.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/connection_thread.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/registry.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/fullscreen_shell.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/shm_pool.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/surface.cpp
|
||||
${CMAKE_BINARY_DIR}/wayland_protocols/wayland-client-fullscreen-shell.c
|
||||
${KWIN_SOURCE_DIR}/wayland_server/buffer_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/compositor_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/display.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/output_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/seat_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/shell_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/surface_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/buffer_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/compositor_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/display.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/output_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/seat_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/shell_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/surface_interface.cpp
|
||||
)
|
||||
add_executable(testWaylandSurface ${testWaylandSurface_SRCS})
|
||||
add_dependencies(testWaylandSurface wayland-client-fullscreen-shell)
|
||||
|
@ -141,24 +141,24 @@ ecm_mark_as_test(testWaylandSurface)
|
|||
########################################################
|
||||
set( testWaylandSeat_SRCS
|
||||
test_wayland_seat.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/buffer.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/compositor.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/connection_thread.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/registry.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/fullscreen_shell.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/keyboard.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/pointer.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/seat.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/shm_pool.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_client/surface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/buffer.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/compositor.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/connection_thread.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/registry.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/fullscreen_shell.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/keyboard.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/pointer.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/seat.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/shm_pool.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/client/surface.cpp
|
||||
${CMAKE_BINARY_DIR}/wayland_protocols/wayland-client-fullscreen-shell.c
|
||||
${KWIN_SOURCE_DIR}/wayland_server/buffer_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/compositor_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/display.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/output_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/seat_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/shell_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/surface_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/buffer_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/compositor_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/display.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/output_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/seat_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/shell_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/surface_interface.cpp
|
||||
)
|
||||
add_executable(testWaylandSeat ${testWaylandSeat_SRCS})
|
||||
add_dependencies(testWaylandSeat wayland-client-fullscreen-shell)
|
||||
|
|
|
@ -20,8 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
// Qt
|
||||
#include <QtTest/QtTest>
|
||||
// KWin
|
||||
#include "../../wayland_client/connection_thread.h"
|
||||
#include "../../wayland_server/display.h"
|
||||
#include "../../src/client/connection_thread.h"
|
||||
#include "../../src/server/display.h"
|
||||
// Wayland
|
||||
#include <wayland-client-protocol.h>
|
||||
|
||||
|
|
|
@ -20,9 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
// Qt
|
||||
#include <QtTest/QtTest>
|
||||
// KWin
|
||||
#include "../../wayland_client/connection_thread.h"
|
||||
#include "../../wayland_client/registry.h"
|
||||
#include "../../wayland_client/fullscreen_shell.h"
|
||||
#include "../../src/client/connection_thread.h"
|
||||
#include "../../src/client/registry.h"
|
||||
#include "../../src/client/fullscreen_shell.h"
|
||||
// Wayland
|
||||
#include <wayland-client-protocol.h>
|
||||
|
||||
|
|
|
@ -20,11 +20,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
// Qt
|
||||
#include <QtTest/QtTest>
|
||||
// KWin
|
||||
#include "../../wayland_client/connection_thread.h"
|
||||
#include "../../wayland_client/output.h"
|
||||
#include "../../wayland_client/registry.h"
|
||||
#include "../../wayland_server/display.h"
|
||||
#include "../../wayland_server/output_interface.h"
|
||||
#include "../../src/client/connection_thread.h"
|
||||
#include "../../src/client/output.h"
|
||||
#include "../../src/client/registry.h"
|
||||
#include "../../src/server/display.h"
|
||||
#include "../../src/server/output_interface.h"
|
||||
// Wayland
|
||||
#include <wayland-client-protocol.h>
|
||||
|
||||
|
|
|
@ -20,13 +20,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
// Qt
|
||||
#include <QtTest/QtTest>
|
||||
// KWin
|
||||
#include "../../wayland_client/connection_thread.h"
|
||||
#include "../../wayland_client/registry.h"
|
||||
#include "../wayland_server/compositor_interface.h"
|
||||
#include "../../wayland_server/display.h"
|
||||
#include "../wayland_server/output_interface.h"
|
||||
#include "../wayland_server/seat_interface.h"
|
||||
#include "../wayland_server/shell_interface.h"
|
||||
#include "../../src/client/connection_thread.h"
|
||||
#include "../../src/client/registry.h"
|
||||
#include "../../src/server/compositor_interface.h"
|
||||
#include "../../src/server/display.h"
|
||||
#include "../../src/server/output_interface.h"
|
||||
#include "../../src/server/seat_interface.h"
|
||||
#include "../../src/server/shell_interface.h"
|
||||
// Wayland
|
||||
#include <wayland-client-protocol.h>
|
||||
|
||||
|
|
|
@ -20,19 +20,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
// Qt
|
||||
#include <QtTest/QtTest>
|
||||
// KWin
|
||||
#include "../../wayland_client/compositor.h"
|
||||
#include "../../wayland_client/connection_thread.h"
|
||||
#include "../../wayland_client/keyboard.h"
|
||||
#include "../../wayland_client/pointer.h"
|
||||
#include "../../wayland_client/surface.h"
|
||||
#include "../../wayland_client/registry.h"
|
||||
#include "../../wayland_client/seat.h"
|
||||
#include "../../wayland_client/shm_pool.h"
|
||||
#include "../../wayland_server/buffer_interface.h"
|
||||
#include "../../wayland_server/compositor_interface.h"
|
||||
#include "../../wayland_server/display.h"
|
||||
#include "../../wayland_server/seat_interface.h"
|
||||
#include "../../wayland_server/surface_interface.h"
|
||||
#include "../../src/client/compositor.h"
|
||||
#include "../../src/client/connection_thread.h"
|
||||
#include "../../src/client/keyboard.h"
|
||||
#include "../../src/client/pointer.h"
|
||||
#include "../../src/client/surface.h"
|
||||
#include "../../src/client/registry.h"
|
||||
#include "../../src/client/seat.h"
|
||||
#include "../../src/client/shm_pool.h"
|
||||
#include "../../src/server/buffer_interface.h"
|
||||
#include "../../src/server/compositor_interface.h"
|
||||
#include "../../src/server/display.h"
|
||||
#include "../../src/server/seat_interface.h"
|
||||
#include "../../src/server/surface_interface.h"
|
||||
// Wayland
|
||||
#include <wayland-client-protocol.h>
|
||||
|
||||
|
|
|
@ -20,16 +20,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
// Qt
|
||||
#include <QtTest/QtTest>
|
||||
// KWin
|
||||
#include "../../wayland_client/compositor.h"
|
||||
#include "../../wayland_client/connection_thread.h"
|
||||
#include "../../wayland_client/shell.h"
|
||||
#include "../../wayland_client/surface.h"
|
||||
#include "../../wayland_client/registry.h"
|
||||
#include "../../wayland_server/buffer_interface.h"
|
||||
#include "../../wayland_server/compositor_interface.h"
|
||||
#include "../../wayland_server/display.h"
|
||||
#include "../../wayland_server/shell_interface.h"
|
||||
#include "../../wayland_server/surface_interface.h"
|
||||
#include "../../src/client/compositor.h"
|
||||
#include "../../src/client/connection_thread.h"
|
||||
#include "../../src/client/shell.h"
|
||||
#include "../../src/client/surface.h"
|
||||
#include "../../src/client/registry.h"
|
||||
#include "../../src/server/buffer_interface.h"
|
||||
#include "../../src/server/compositor_interface.h"
|
||||
#include "../../src/server/display.h"
|
||||
#include "../../src/server/shell_interface.h"
|
||||
#include "../../src/server/surface_interface.h"
|
||||
// Wayland
|
||||
#include <wayland-client-protocol.h>
|
||||
|
||||
|
|
|
@ -21,15 +21,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#include <QtTest/QtTest>
|
||||
#include <QImage>
|
||||
// KWin
|
||||
#include "../../wayland_client/compositor.h"
|
||||
#include "../../wayland_client/connection_thread.h"
|
||||
#include "../../wayland_client/surface.h"
|
||||
#include "../../wayland_client/registry.h"
|
||||
#include "../../wayland_client/shm_pool.h"
|
||||
#include "../../wayland_server/buffer_interface.h"
|
||||
#include "../../wayland_server/compositor_interface.h"
|
||||
#include "../../wayland_server/display.h"
|
||||
#include "../../wayland_server/surface_interface.h"
|
||||
#include "../../src/client/compositor.h"
|
||||
#include "../../src/client/connection_thread.h"
|
||||
#include "../../src/client/surface.h"
|
||||
#include "../../src/client/registry.h"
|
||||
#include "../../src/client/shm_pool.h"
|
||||
#include "../../src/server/buffer_interface.h"
|
||||
#include "../../src/server/compositor_interface.h"
|
||||
#include "../../src/server/display.h"
|
||||
#include "../../src/server/surface_interface.h"
|
||||
// Wayland
|
||||
#include <wayland-client-protocol.h>
|
||||
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
########################################################
|
||||
set( testWaylandServerDisplay_SRCS
|
||||
test_display.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/buffer_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/compositor_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/display.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/output_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/seat_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/shell_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/surface_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/buffer_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/compositor_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/display.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/output_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/seat_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/shell_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/surface_interface.cpp
|
||||
)
|
||||
add_executable(testWaylandServerDisplay ${testWaylandServerDisplay_SRCS})
|
||||
target_link_libraries( testWaylandServerDisplay Qt5::Test Qt5::Gui Wayland::Server)
|
||||
|
@ -21,13 +21,13 @@ ecm_mark_as_test(testWaylandServerDisplay)
|
|||
########################################################
|
||||
set( testWaylandServerSeat_SRCS
|
||||
test_seat.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/buffer_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/compositor_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/display.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/output_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/seat_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/shell_interface.cpp
|
||||
${KWIN_SOURCE_DIR}/wayland_server/surface_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/buffer_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/compositor_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/display.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/output_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/seat_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/shell_interface.cpp
|
||||
${KWAYLAND_SOURCE_DIR}/src/server/surface_interface.cpp
|
||||
)
|
||||
add_executable(testWaylandServerSeat ${testWaylandServerSeat_SRCS})
|
||||
target_link_libraries( testWaylandServerSeat Qt5::Test Qt5::Gui Wayland::Server)
|
||||
|
|
|
@ -20,8 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
// Qt
|
||||
#include <QtTest/QtTest>
|
||||
// WaylandServer
|
||||
#include "../../wayland_server/display.h"
|
||||
#include "../../wayland_server/output_interface.h"
|
||||
#include "../../src/server/display.h"
|
||||
#include "../../src/server/output_interface.h"
|
||||
|
||||
using namespace KWin::WaylandServer;
|
||||
|
||||
|
|
|
@ -20,8 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
// Qt
|
||||
#include <QtTest/QtTest>
|
||||
// WaylandServer
|
||||
#include "../../wayland_server/display.h"
|
||||
#include "../../wayland_server/seat_interface.h"
|
||||
#include "../../src/server/display.h"
|
||||
#include "../../src/server/seat_interface.h"
|
||||
|
||||
using namespace KWin::WaylandServer;
|
||||
|
||||
|
|
Loading…
Reference in a new issue