From fcf3fc37a495435e3e12d32b92d0b0691509f688 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Fri, 4 Feb 2022 13:08:01 +0100
Subject: [PATCH] CMake: Fix qtwayland feature detection

The dmabuf_server_buffer test links to EGL and libdrm and the vulkan_server_buffer
one needs to link to wayland-client

Fixes: QTBUG-100475
Pick-to: 6.3 6.2
Change-Id: Idbcef88bba0a9d5ef7bfeaa55668c94caee6ab83
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/platformsupport/wayland/configure.cmake | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/platformsupport/wayland/configure.cmake b/src/platformsupport/wayland/configure.cmake
index 1c1cf1e883f..3fd7f93e08b 100644
--- a/src/platformsupport/wayland/configure.cmake
+++ b/src/platformsupport/wayland/configure.cmake
@@ -43,6 +43,18 @@ if(LINUX OR QT_FIND_ALL_PACKAGES_ALWAYS)
     if(NOT TARGET XKB::XKB)
         qt_find_package(XKB 0.5.0 PROVIDED_TARGETS XKB::XKB MODULE_NAME gui QMAKE_LIB xkbcommon MARK_OPTIONAL)
     endif()
+    # EGL
+    if(NOT TARGET EGL::EGL)
+        qt_find_package(EGL PROVIDED_TARGETS EGL::EGL MODULE_NAME gui QMAKE_LIB egl MARK_OPTIONAL)
+    endif()
+    # and Libdrm
+    if(NOT TARGET Libdrm::Libdrm)
+        qt_find_package(Libdrm
+            PROVIDED_TARGETS Libdrm::Libdrm
+            MODULE_NAME gui
+            QMAKE_LIB drm
+            MARK_OPTIONAL)
+    endif()
 endif()
 
 
@@ -129,6 +141,8 @@ return 1;
 # vulkan-server-buffer
 qt_config_compile_test(vulkan_server_buffer
     LABEL "Vulkan Buffer Sharing"
+    LIBRARIES
+    Wayland::Client
     CODE
     "#define VK_USE_PLATFORM_WAYLAND_KHR 1
 #include <vulkan/vulkan.h>
@@ -151,6 +165,7 @@ qt_config_compile_test(egl_1_5_wayland
     LABEL "EGL 1.5 with Wayland Platform"
     LIBRARIES
     EGL::EGL
+    Wayland::Client
     CODE
     "
 #include <EGL/egl.h>