diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2021-09-02 18:58:48 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-08 13:39:08 +0000 |
| commit | 5b0e54d763338808a35f07d5481460c4cdd0c008 (patch) | |
| tree | 5f9be6da6977f049c62d72da29550d7873b21adc | |
| parent | 78b35d586a5265408aa9bcb33f2b3afd850a10f1 (diff) | |
| download | qtwayland-5b0e54d763338808a35f07d5481460c4cdd0c008.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.
Change-Id: I87662089b09490a9cd477f62ab2b2ce8d54df503
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit a86046d15ac492479785293e213ec0887c116330)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/compositor/configure.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/compositor/configure.cmake b/src/compositor/configure.cmake index 9c5864e3..7453e811 100644 --- a/src/compositor/configure.cmake +++ b/src/compositor/configure.cmake @@ -28,6 +28,13 @@ 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() +# 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 |