From 390df5c26450fb67f222c0b426db226902304e80 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Sat, 15 Jan 2022 13:59:03 +0100 Subject: [PATCH] Add check flag to Meson run_command() The default value will change soon, so Meson is now showing warnings if you haven't set an explicit value. --- meson.build | 5 ++++- src/common/vst3/meson.build | 8 ++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index af1eac26..4a4bd008 100644 --- a/meson.build +++ b/meson.build @@ -129,7 +129,10 @@ endif # issues so we'll do just that. # # https://bugs.winehq.org/show_bug.cgi?id=49138 -wine_version = run_command('sh', '-c', '''wine --version | grep --only-matching -P '[0-9]+\.[0-9]+' | head -n1''') +wine_version = run_command( + 'sh', '-c', '''wine --version | grep --only-matching -P '[0-9]+\.[0-9]+' | head -n1''', + check : false +) if wine_version.returncode() == 0 message('Targetting Wine @0@'.format(wine_version.stdout())) if wine_version.stdout().version_compare('>=5.7') and \ diff --git a/src/common/vst3/meson.build b/src/common/vst3/meson.build index 88f29275..bc16bcc8 100644 --- a/src/common/vst3/meson.build +++ b/src/common/vst3/meson.build @@ -13,12 +13,8 @@ vst3_include_dir = vst3.get_variable('include_dir') # instead of 'windows.h' like how the file is actually called. # message(vst3_include_dir) vst3_sdk_base_dir = vst3.get_variable('sdk_base_dir') -patch_result = run_command('../../../tools/patch-vst3-sdk.sh', vst3_sdk_base_dir) -if patch_result.returncode() == 0 - message(patch_result.stdout()) -else - error('Error while trying to patch the VST3 SDK:\n' + patch_result.stderr()) -endif +patch_result = run_command('../../../tools/patch-vst3-sdk.sh', vst3_sdk_base_dir, check : true) +message(patch_result.stdout()) # We'll create a dependency for the plugin SDK for our native VST3 plugin vst3_base_native = static_library(