From 0d727274f969be9e2736e6c6be5388a521c5cdc0 Mon Sep 17 00:00:00 2001 From: Georg Lehmann Date: Wed, 21 Apr 2021 12:08:42 +0200 Subject: [PATCH] build: Conditionally enable --quiet for glslang. Signed-off-by: Georg Lehmann --- meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 484c0c19..6e688a89 100644 --- a/meson.build +++ b/meson.build @@ -78,9 +78,13 @@ idl_generator = generator(idl_compiler, arguments : [ '-h', '-o', '@OUTPUT@', '@INPUT@' ]) glsl_compiler = find_program('glslangValidator') +glsl_args = [ '-V', '--vn', '@BASENAME@', '@INPUT@', '-o', '@OUTPUT@' ] +if run_command(glsl_compiler, [ '--quiet', '--version' ]).returncode() == 0 + glsl_args += [ '--quiet' ] +endif glsl_generator = generator(glsl_compiler, output : [ '@BASENAME@.h' ], - arguments : [ '--quiet', '-V', '--vn', '@BASENAME@', '@INPUT@', '-o', '@OUTPUT@' ]) + arguments : glsl_args) threads_dep = dependency('threads') lib_d3d12 = vkd3d_compiler.find_library('d3d12', required : false)