Fixes: 5608d0a2cee47c7d037f ("meson: use array type options")
Signed-off-by: Eric Engestrom <eric.engest...@intel.com>
---
v2: handle both `-D platforms=[]` and `-D platforms=`
---
meson.build | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/meson.build b/meson.build
index e2bc3d6826aa6109e08c..7d3db81c887d82c6fe57 100644
--- a/meson.build
+++ b/meson.build
@@ -222,12 +222,6 @@ else
with_dri_platform = 'none'
endif
-with_platform_android = false
-with_platform_wayland = false
-with_platform_x11 = false
-with_platform_drm = false
-with_platform_surfaceless = false
-egl_native_platform = ''
_platforms = get_option('platforms')
if _platforms.contains('auto')
if system_has_kms_drm
@@ -240,13 +234,17 @@ if _platforms.contains('auto')
error('Unknown OS. Please pass -Dplatforms to set platforms. Patches
gladly accepted to fix this.')
endif
endif
-if _platforms != ['']
- with_platform_android = _platforms.contains('android')
- with_platform_x11 = _platforms.contains('x11')
- with_platform_wayland = _platforms.contains('wayland')
- with_platform_drm = _platforms.contains('drm')
- with_platform_haiku = _platforms.contains('haiku')
- with_platform_surfaceless = _platforms.contains('surfaceless')
+
+with_platform_android = _platforms.contains('android')
+with_platform_x11 = _platforms.contains('x11')
+with_platform_wayland = _platforms.contains('wayland')
+with_platform_drm = _platforms.contains('drm')
+with_platform_haiku = _platforms.contains('haiku')
+with_platform_surfaceless = _platforms.contains('surfaceless')
+
+with_platforms = false
+if _platforms.length() != 0 and _platforms != ['']
+ with_platforms = true
egl_native_platform = _platforms[0]
endif
@@ -289,13 +287,13 @@ endif
_egl = get_option('egl')
if _egl == 'auto'
- with_egl = with_dri and with_shared_glapi and egl_native_platform != ''
+ with_egl = with_dri and with_shared_glapi and with_platforms
elif _egl == 'true'
if not with_dri
error('EGL requires dri')
elif not with_shared_glapi
error('EGL requires shared-glapi')
- elif egl_native_platform == ''
+ elif with_platforms
error('No platforms specified, consider -Dplatforms=drm,x11 at least')
elif not ['disabled', 'dri'].contains(with_glx)
error('EGL requires dri, but a GLX is being built without dri')
--
Cheers,
Eric
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
