summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@qt.io>2021-09-02 18:58:48 +0200
committerDominik Holland <dominik.holland@qt.io>2021-09-08 14:29:19 +0200
commita86046d15ac492479785293e213ec0887c116330 (patch)
tree2cc575dd3d6921eab0351b5fefc377d6e2da748f /src
parent041e11fa43bd0deb3d941c63604e4fdba9d64212 (diff)
downloadqtwayland-a86046d15ac492479785293e213ec0887c116330.tar.gz
Add explicit dependency to Libdrm::Libdrm
We can't rely that qtbase always has a dependency to it. Otherwise static linking of the dmabuf plugins fails. Pick-to: 6.2 Change-Id: I87662089b09490a9cd477f62ab2b2ce8d54df503 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/compositor/configure.cmake7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/compositor/configure.cmake b/src/compositor/configure.cmake
index 3f33ed38..8cbb40f3 100644
--- a/src/compositor/configure.cmake
+++ b/src/compositor/configure.cmake
@@ -9,6 +9,13 @@ if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
endif()
# special case begin
+# 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