From 848f7f31774a9b5d7297b4b50e02676d81ed47b4 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Wed, 2 Sep 2020 19:19:04 +0300 Subject: [PATCH] Revert "plugins/drm: Link against Wayland::Server" This reverts commit efb9e0edb2b7b353379c0e71a6bafe8e5978bdd4. libwayland-server is now in the link interface of kwayland-server. --- CMakeLists.txt | 2 +- plugins/platforms/drm/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 63992e84a3..b898c5a691 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,7 +170,7 @@ if (epoxy_HAS_GLX) endif() endif() -find_package(Wayland 1.2 REQUIRED COMPONENTS Server OPTIONAL_COMPONENTS Egl) +find_package(Wayland 1.2 OPTIONAL_COMPONENTS Egl) set_package_properties(Wayland PROPERTIES TYPE REQUIRED PURPOSE "Required for building KWin with Wayland support" diff --git a/plugins/platforms/drm/CMakeLists.txt b/plugins/platforms/drm/CMakeLists.txt index f392ff39a7..87e916f6da 100644 --- a/plugins/platforms/drm/CMakeLists.txt +++ b/plugins/platforms/drm/CMakeLists.txt @@ -32,7 +32,7 @@ include_directories(${CMAKE_SOURCE_DIR}/platformsupport/scenes/opengl) add_library(KWinWaylandDrmBackend MODULE ${DRM_SOURCES}) set_target_properties(KWinWaylandDrmBackend PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org.kde.kwin.waylandbackends/") -target_link_libraries(KWinWaylandDrmBackend kwin Wayland::Server Libdrm::Libdrm SceneQPainterBackend SceneOpenGLBackend) +target_link_libraries(KWinWaylandDrmBackend kwin Libdrm::Libdrm SceneQPainterBackend SceneOpenGLBackend) if (HAVE_GBM) target_link_libraries(KWinWaylandDrmBackend gbm::gbm)