From 4be0cbb5b35ed3c1dcc912a919bfdb1e414e84fd Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Tue, 5 Oct 2021 10:57:18 +0200 Subject: [PATCH] Add explicit dependency to Libdrm::Libdrm for the client as well Similar to the compositor, we can't rely that qtbase always has a dependency to it. Pick-to: 6.2 Fixes: QTBUG-96845 Change-Id: I2b5535c3cb57c8f2193800aac09e097d2b729ce2 Reviewed-by: Joerg Bornemann --- src/plugins/platforms/wayland/configure.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/plugins/platforms/wayland/configure.cmake b/src/plugins/platforms/wayland/configure.cmake index c90204d0ec4..cb3cbbda3cf 100644 --- a/src/plugins/platforms/wayland/configure.cmake +++ b/src/plugins/platforms/wayland/configure.cmake @@ -5,6 +5,13 @@ #### Libraries +# Even if libdrm is already found by qtbase we still need to list it as dependency for some of our +# plugins +if(TARGET Libdrm::Libdrm) + qt_internal_disable_find_package_global_promotion(Libdrm::Libdrm) +endif() +qt_find_package(Libdrm PROVIDED_TARGETS Libdrm::Libdrm MODULE_NAME gui QMAKE_LIB drm MARK_OPTIONAL) + #### Tests