About Social Code
aboutsummaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
authorAntonio Ospite <antonio.ospite@collabora.com>2025-08-12 18:22:09 +0200
committerMarge Bot <marge-bot@fdo.invalid>2025-08-25 15:55:54 +0000
commitca0f0d7b95949ec9625fd856e4a44770282eaa8d (patch)
tree1c78cfb6a1b40702b569e9b505025fb4ae821ad6 /meson.build
parent9d26eb9a2fb4cef1cf73e9c8613155b553fe51cc (diff)
meson: handle dep_libdrm before the driver specific libdrm modules
Handle dep_libdrm before the driver specific libdrm modules, this is for when libdrm is built as a subproject, for example libdrm_amdgpu is only available after dep_libdrm has been added. Acked-by: Valentine Burley <valentine.burley@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36710>
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build28
1 files changed, 14 insertions, 14 deletions
diff --git a/meson.build b/meson.build
index 29f4898a7ca..103a63225e7 100644
--- a/meson.build
+++ b/meson.build
@@ -1691,20 +1691,6 @@ endif
allow_fallback_for_libdrm = get_option('allow-fallback-for').contains('libdrm')
-# Then get each libdrm module
-foreach d : _libdrm_checks
- if d[1]
- set_variable(
- 'dep_libdrm_' + d[0],
- dependency(
- 'libdrm_' + d[0],
- version : '>=' + _drm_ver,
- allow_fallback: allow_fallback_for_libdrm,
- )
- )
- endif
-endforeach
-
with_gallium_drisw_kms = false
if system_has_kms_drm
dep_libdrm = dependency(
@@ -1724,6 +1710,20 @@ if dep_libdrm.found()
endif
endif
+# Then get each libdrm module
+foreach d : _libdrm_checks
+ if d[1]
+ set_variable(
+ 'dep_libdrm_' + d[0],
+ dependency(
+ 'libdrm_' + d[0],
+ version : '>=' + _drm_ver,
+ allow_fallback: allow_fallback_for_libdrm,
+ )
+ )
+ endif
+endforeach
+
dep_libudev = dependency('libudev', required : false)
if dep_libudev.found()
pre_args += '-DHAVE_LIBUDEV'