From 3a4a16e9e8846c7710227b8075ffcf166069e9ff Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Sun, 26 Nov 2023 08:45:21 +0000 Subject: [PATCH] meson: regroup glvnd lines to get an easier-to-review diff in the next commit Part-of: --- meson.build | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 59a784ca095f5..8d928f5cddc54 100644 --- a/meson.build +++ b/meson.build @@ -543,8 +543,8 @@ if with_glx != 'disabled' endif endif +dep_glvnd = null_dep with_glvnd = get_option('glvnd') -glvnd_vendor_name = get_option('glvnd-vendor-name') if with_glvnd if with_platform_windows error('glvnd cannot be used on Windows') @@ -556,7 +556,10 @@ if with_glvnd if get_option('egl-lib-suffix') != '' error('''EGL lib suffix can't be used with libglvnd''') endif + dep_glvnd = dependency('libglvnd', version : '>= 1.3.2') + pre_args += '-DUSE_LIBGLVND=1' endif +glvnd_vendor_name = get_option('glvnd-vendor-name') if with_vulkan_icd_dir == '' with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d') @@ -1894,12 +1897,6 @@ elif with_gallium_radeonsi error('Gallium driver radeonsi requires libelf') endif -dep_glvnd = null_dep -if with_glvnd - dep_glvnd = dependency('libglvnd', version : '>= 1.3.2') - pre_args += '-DUSE_LIBGLVND=1' -endif - dep_valgrind = dependency('valgrind', required : get_option('valgrind')) if dep_valgrind.found() pre_args += '-DHAVE_VALGRIND'