Commit 111db5e6 authored by David Edmundson's avatar David Edmundson
Browse files

Link Wayland::Server as an external dependency

Raw wl_ objects are used throughout the public headers repeatedly.

Exporting the linked library helps clients (kwin) build cleanly.
parent 52fa41de
...@@ -4,6 +4,7 @@ set(PROJECT_VERSION_MAJOR 5) ...@@ -4,6 +4,7 @@ set(PROJECT_VERSION_MAJOR 5)
set(QT_MIN_VERSION "5.14.0") set(QT_MIN_VERSION "5.14.0")
set(KF5_MIN_VERSION "5.70.0") set(KF5_MIN_VERSION "5.70.0")
set(WAYLAND_MIN_VERSION "1.15")
project(KWaylandServer VERSION ${PROJECT_VERSION}) project(KWaylandServer VERSION ${PROJECT_VERSION})
...@@ -44,7 +45,7 @@ find_package(PlasmaWaylandProtocols CONFIG REQUIRED) ...@@ -44,7 +45,7 @@ find_package(PlasmaWaylandProtocols CONFIG REQUIRED)
find_package(QtWaylandScanner 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 set_package_properties(Wayland PROPERTIES
TYPE REQUIRED TYPE REQUIRED
) )
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
include(CMakeFindDependencyMacro) include(CMakeFindDependencyMacro)
find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) find_dependency(Qt5Gui @REQUIRED_QT_VERSION@)
find_dependency(KF5Wayland "@KF5_DEP_VERSION@") find_dependency(KF5Wayland "@KF5_DEP_VERSION@")
find_dependency(Wayland "@WAYLAND_MIN_VERSION@")
include("${CMAKE_CURRENT_LIST_DIR}/KWaylandServerTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/KWaylandServerTargets.cmake")
@PACKAGE_INCLUDE_QCHTARGETS@ @PACKAGE_INCLUDE_QCHTARGETS@
...@@ -345,9 +345,10 @@ ecm_generate_export_header(KWaylandServer ...@@ -345,9 +345,10 @@ ecm_generate_export_header(KWaylandServer
target_include_directories(KWaylandServer INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}>") target_include_directories(KWaylandServer INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}>")
target_link_libraries(KWaylandServer target_link_libraries(KWaylandServer
PUBLIC Qt5::Gui PUBLIC
PRIVATE Qt5::Gui
Wayland::Server Wayland::Server
PRIVATE
EGL::EGL EGL::EGL
Qt5::Concurrent Qt5::Concurrent
) )
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <QSharedPointer> #include <QSharedPointer>
#include <functional> #include <functional>
#include <KWaylandServer/kwaylandserver_export.h> #include <KWaylandServer/kwaylandserver_export.h>
#include <wayland-server.h>
struct wl_resource; struct wl_resource;
......
Markdown is supported
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