Mesa (master): meson: Use true and false instead of yes and no for tristate options
Dylan Baker
dbaker at kemper.freedesktop.org
Tue Oct 31 17:38:29 UTC 2017
Module: Mesa
Branch: master
Commit: 0589331d54396cbcdcf985ba37470e77a4c7bee2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0589331d54396cbcdcf985ba37470e77a4c7bee2
Author: Dylan Baker <dylan at pnwbakers.com>
Date: Mon Oct 30 10:27:48 2017 -0700
meson: Use true and false instead of yes and no for tristate options
This allows a user to not care whether they're setting a tristate or a
boolean option, which is a nice user facing feature, and something I've
personally run into.
Suggested-by: Adam Jackson <ajax at redhat.com>
Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>
---
meson.build | 6 +++---
meson_options.txt | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index d6a2d83b56..d22d49535a 100644
--- a/meson.build
+++ b/meson.build
@@ -170,7 +170,7 @@ endif
with_gbm = get_option('gbm')
if with_gbm == 'auto' and with_dri # TODO: or gallium
with_gbm = host_machine.system() == 'linux'
-elif with_gbm == 'yes'
+elif with_gbm == 'true'
if not ['linux', 'bsd'].contains(host_machine.system())
error('GBM only supports unix-like platforms')
endif
@@ -182,7 +182,7 @@ endif
_egl = get_option('egl')
if _egl == 'auto'
with_egl = with_dri and with_shared_glapi and egl_native_platform != ''
-elif _egl == 'yes'
+elif _egl == 'true'
if not with_dri
error('EGL requires dri')
elif not with_shared_glapi
@@ -264,7 +264,7 @@ if with_dri3 == 'auto'
else
with_dri3 = false
endif
-elif with_dri3 == 'yes'
+elif with_dri3 == 'true'
with_dri3 = true
else
with_dri3 = false
diff --git a/meson_options.txt b/meson_options.txt
index f6f21b4c02..d93dd6eab2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -28,7 +28,7 @@ option(
'dri3',
type : 'combo',
value : 'auto',
- choices : ['auto', 'yes', 'no'],
+ choices : ['auto', 'true', 'false'],
description : 'enable support for dri3'
)
option(
@@ -101,7 +101,7 @@ option(
'gbm',
type : 'combo',
value : 'auto',
- choices : ['auto', 'yes', 'no'],
+ choices : ['auto', 'true', 'false'],
description : 'Build support for gbm platform'
)
option(
@@ -115,7 +115,7 @@ option(
'egl',
type : 'combo',
value : 'auto',
- choices : ['auto', 'yes', 'no'],
+ choices : ['auto', 'true', 'false'],
description : 'Build support for EGL platform'
)
option(
More information about the mesa-commit
mailing list