commit 7411586812d576fca6ec03b8a17e4c98f066839b Author: David Edmundson Date: Wed Sep 2 17:04:52 2020 +0100 Link Wayland::Server as an external dependency Raw wl_ objects are used throughout the public headers, especially in the older code. The one kwayland-server user previously happened to link Wayland::Server anyway, but it should be done here. diff --git a/CMakeLists.txt b/CMakeLists.txt index afe5903..165ea4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,7 @@ set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.14.0") set(KF5_MIN_VERSION "5.70.0") +set(WAYLAND_MIN_VERSION "1.15") project(KWaylandServer VERSION ${PROJECT_VERSION}) @@ -44,7 +45,7 @@ find_package(PlasmaWaylandProtocols CONFIG REQUIRED) find_package(QtWaylandScanner REQUIRED) -find_package(Wayland 1.15 COMPONENTS Client Server) +find_package(Wayland ${WAYLAND_MIN_VERSION} COMPONENTS Client Server) set_package_properties(Wayland PROPERTIES TYPE REQUIRED ) diff --git a/KWaylandServerConfig.cmake.in b/KWaylandServerConfig.cmake.in index 131d17e..125acfe 100644 --- a/KWaylandServerConfig.cmake.in +++ b/KWaylandServerConfig.cmake.in @@ -3,6 +3,7 @@ include(CMakeFindDependencyMacro) find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) find_dependency(KF5Wayland "@KF5_DEP_VERSION@") +find_dependency(Wayland "@WAYLAND_MIN_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KWaylandServerTargets.cmake") @PACKAGE_INCLUDE_QCHTARGETS@ diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 0f99682..6f9d4a9 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -345,9 +345,10 @@ ecm_generate_export_header(KWaylandServer target_include_directories(KWaylandServer INTERFACE "$") target_link_libraries(KWaylandServer - PUBLIC Qt5::Gui - PRIVATE + PUBLIC + Qt5::Gui Wayland::Server + PRIVATE EGL::EGL Qt5::Concurrent ) diff --git a/src/server/screencast_interface.h b/src/server/screencast_interface.h index 439f2ec..79730d1 100644 --- a/src/server/screencast_interface.h +++ b/src/server/screencast_interface.h @@ -12,6 +12,7 @@ #include #include #include +#include struct wl_resource;