diff options
| author | Christophe Giboudeaux <christophe@krop.fr> | 2022-02-04 13:08:01 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-05 01:43:16 +0000 |
| commit | 4389a6ac0449f7cd6409f4d7b4c05e12b836a0a8 (patch) | |
| tree | e25ac9400f73857d024411cc46bab63bfa6afa3a | |
| parent | 6f8983c9f45e7b3d129007f201a2418c6f2ff5d7 (diff) | |
| download | qtwayland-4389a6ac0449f7cd6409f4d7b4c05e12b836a0a8.tar.gz | |
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
Change-Id: Idbcef88bba0a9d5ef7bfeaa55668c94caee6ab83
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 5fc2e1915c3ad5cfb8ed9c7128e1a13b630cd4ef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/configure.cmake | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/configure.cmake b/src/configure.cmake index 1c1cf1e8..3fd7f93e 100644 --- a/src/configure.cmake +++ b/src/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> |