1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Fix qtwayland feature detection

Browse Source 
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>
This commit is contained in:
Christophe Giboudeaux 2022-02-04 13:08:01 +01:00
parent cdc1b7ab94
commit fcf3fc37a4
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/platformsupport/wayland/configure.cmake
View File

@ -43,6 +43,18 @@ if(LINUX OR QT_FIND_ALL_PACKAGES_ALWAYS)
if(NOT TARGET XKB::XKB) if(NOT TARGET XKB::XKB)
qt_find_package(XKB 0.5.0 PROVIDED_TARGETS XKB::XKB MODULE_NAME gui QMAKE_LIB xkbcommon MARK_OPTIONAL) qt_find_package(XKB 0.5.0 PROVIDED_TARGETS XKB::XKB MODULE_NAME gui QMAKE_LIB xkbcommon MARK_OPTIONAL)
endif() 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() endif()
@ -129,6 +141,8 @@ return 1;
# vulkan-server-buffer # vulkan-server-buffer
qt_config_compile_test(vulkan_server_buffer qt_config_compile_test(vulkan_server_buffer
LABEL "Vulkan Buffer Sharing" LABEL "Vulkan Buffer Sharing"
LIBRARIES
Wayland::Client
CODE CODE
"#define VK_USE_PLATFORM_WAYLAND_KHR 1 "#define VK_USE_PLATFORM_WAYLAND_KHR 1
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
@ -151,6 +165,7 @@ qt_config_compile_test(egl_1_5_wayland
LABEL "EGL 1.5 with Wayland Platform" LABEL "EGL 1.5 with Wayland Platform"
LIBRARIES LIBRARIES
EGL::EGL EGL::EGL
Wayland::Client
CODE CODE
" "
#include <EGL/egl.h> #include <EGL/egl.h>