diff options
| author | Eric Engestrom <eric@engestrom.ch> | 2018-05-14 16:40:47 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-06-02 19:36:12 +0000 |
| commit | d32144602c1dfd507f07774ce906dc25d2697da0 (patch) | |
| tree | 8317c18a9b64b9ac7abf1805e7700cbe47234848 /meson_options.txt | |
| parent | a2903dd767f77edccb671f30e9e0686b50879cca (diff) | |
meson: remove "empty array"/"array of an empty string" confusion
Until Meson 0.47, setting `-D arrayoption=` was not the same as setting
`-D arrayoption=[]`; the latter cleared the array, while the former
filled it with an empty string option.
Since Meson 0.47 [1], the former maps to the latter, so empty items can
only be set by explicitly giving an array containing an empty string,
ie. `-D arrayoption="['']"`; however note that this is *not* what we
want in any of the current Mesa code anyway.
This makes the code handling array options a bit more complicated, and
a lot more error-prone, so let's get rid of the confusion by removing
the empty-string option.
[1] https://github.com/mesonbuild/meson/commit/f3a8f9c34d95d862fb4d12869a7b31cea592561f
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/386>
Diffstat (limited to 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meson_options.txt b/meson_options.txt index 464b99286ee..913dd497449 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -23,7 +23,7 @@ option( type : 'array', value : ['auto'], choices : [ - '', 'auto', 'x11', 'wayland', 'drm', 'surfaceless', 'haiku', 'android', + 'auto', 'x11', 'wayland', 'drm', 'surfaceless', 'haiku', 'android', 'windows', ], description : 'window systems to support. If this is set to `auto`, all platforms applicable will be enabled.' @@ -39,7 +39,7 @@ option( 'dri-drivers', type : 'array', value : ['auto'], - choices : ['', 'auto', 'i915', 'i965', 'r100', 'r200', 'nouveau', 'swrast'], + choices : ['auto', 'i915', 'i965', 'r100', 'r200', 'nouveau', 'swrast'], description : 'List of dri drivers to build. If this is set to auto all drivers applicable to the target OS/architecture will be built' ) option( @@ -59,7 +59,7 @@ option( type : 'array', value : ['auto'], choices : [ - '', 'auto', 'kmsro', 'radeonsi', 'r300', 'r600', 'nouveau', 'freedreno', + 'auto', 'kmsro', 'radeonsi', 'r300', 'r600', 'nouveau', 'freedreno', 'swrast', 'v3d', 'vc4', 'etnaviv', 'tegra', 'i915', 'svga', 'virgl', 'swr', 'panfrost', 'iris', 'lima', 'zink' ], @@ -159,7 +159,7 @@ option( 'vulkan-drivers', type : 'array', value : ['auto'], - choices : ['', 'auto', 'amd', 'freedreno', 'intel'], + choices : ['auto', 'amd', 'freedreno', 'intel'], description : 'List of vulkan drivers to build. If this is set to auto all drivers applicable to the target OS/architecture will be built' ) option( |