From 3ee8be0be88e62a82823a54c800fd84e45a70da1 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 17 Apr 2022 20:23:58 +0200 Subject: [PATCH] Add explicit check arguments to run_command, to fix a Meson warning. --- meson.build | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 56ea5be..0e1555e 100644 --- a/meson.build +++ b/meson.build @@ -137,16 +137,16 @@ if have_cef endif # Symlink the files into the build directory, so that running nageru without ninja install works. - run_command('mkdir', join_paths(meson.current_build_dir(), 'locales/')) + run_command('mkdir', '-p', join_paths(meson.current_build_dir(), 'locales/'), check: true) foreach file : cef_libs - run_command('ln', '-s', join_paths(cef_lib_dir, file), meson.current_build_dir()) + run_command('ln', '-sf', join_paths(cef_lib_dir, file), meson.current_build_dir(), check: true) install_data(join_paths(cef_lib_dir, file), install_dir: exe_dir) endforeach foreach file : cef_resources - run_command('ln', '-s', join_paths(cef_resource_dir, file), meson.current_build_dir()) + run_command('ln', '-sf', join_paths(cef_resource_dir, file), meson.current_build_dir(), check: true) install_data(join_paths(cef_resource_dir, file), install_dir: exe_dir) endforeach - run_command('ln', '-s', join_paths(cef_resource_dir, 'locales/en-US.pak'), join_paths(meson.current_build_dir(), 'locales/')) + run_command('ln', '-sf', join_paths(cef_resource_dir, 'locales/en-US.pak'), join_paths(meson.current_build_dir(), 'locales/'), check: true) install_data(join_paths(cef_resource_dir, 'locales/en-US.pak'), install_dir: join_paths(exe_dir, 'locales')) # NOTE: We link against libcef.so in the local directory, _not_ in the CEF directory, @@ -238,7 +238,7 @@ nageru_srcs += proto_generated # Shaders needed at runtime. shaders = ['nageru/cbcr_subsample.vert', 'nageru/cbcr_subsample.frag', 'nageru/uyvy_subsample.vert', 'nageru/uyvy_subsample.frag', 'nageru/v210_subsample.comp', 'nageru/timecode.vert', 'nageru/timecode.frag', 'nageru/timecode_10bit.frag'] foreach shader : shaders - run_command('ln', '-s', join_paths(meson.current_source_dir(), shader), meson.current_build_dir()) + run_command('ln', '-sf', join_paths(meson.current_source_dir(), shader), meson.current_build_dir(), check: true) endforeach nageru_shader_srcs = bin2h_gen.process(shaders) @@ -277,7 +277,7 @@ executable('benchmark_audio_mixer', 'nageru/benchmark_audio_mixer.cpp', dependen data_files = ['nageru/theme.lua', 'nageru/simple.lua', 'nageru/bg.jpeg', 'nageru/akai_midimix.midimapping', 'futatabi/behringer_cmd_pl1.midimapping'] install_data(data_files, install_dir: join_paths(get_option('prefix'), 'share/nageru')) foreach file : data_files - run_command('ln', '-s', join_paths(meson.current_source_dir(), file), meson.current_build_dir()) + run_command('ln', '-sf', join_paths(meson.current_source_dir(), file), meson.current_build_dir(), check: true) endforeach # Futatabi. (Not a subdir() because we don't want the output in nageru/nageru.) @@ -314,7 +314,7 @@ shaders += ['futatabi/add_base_flow.frag', 'futatabi/blend.frag', 'futatabi/chro 'futatabi/sobel.frag', 'futatabi/sor.frag', 'futatabi/splat.frag'] foreach shader : shaders - run_command('ln', '-s', join_paths(meson.current_source_dir(), shader), meson.current_build_dir()) + run_command('ln', '-sf', join_paths(meson.current_source_dir(), shader), meson.current_build_dir(), check: true) endforeach futatabi_shader_srcs = bin2h_gen.process(shaders) -- 2.39.2