Fixes: 5608d0a2cee47c7d037f ("meson: use array type options") Signed-off-by: Eric Engestrom <eric.engest...@intel.com> --- v2: handle both `-D vulkan-drivers=[]` and `-D vulkan-drivers=` --- meson.build | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/meson.build b/meson.build index 556860e1e97ad94a0572..e2bc3d6826aa6109e08c 100644 --- a/meson.build +++ b/meson.build @@ -171,9 +171,6 @@ if with_gallium and system_has_kms_drm endif endif -with_intel_vk = false -with_amd_vk = false -with_any_vk = false _vulkan_drivers = get_option('vulkan-drivers') if _vulkan_drivers.contains('auto') if system_has_kms_drm @@ -189,11 +186,10 @@ if _vulkan_drivers.contains('auto') error('Unknown OS. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.') endif endif -if _vulkan_drivers != [''] - with_intel_vk = _vulkan_drivers.contains('intel') - with_amd_vk = _vulkan_drivers.contains('amd') - with_any_vk = true -endif + +with_intel_vk = _vulkan_drivers.contains('intel') +with_amd_vk = _vulkan_drivers.contains('amd') +with_any_vk = _vulkan_drivers.length() != 0 and _vulkan_drivers != [''] if with_dri_swrast and (with_gallium_softpipe or with_gallium_swr) error('Only one swrast provider can be built') -- Cheers, Eric _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev