mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-25 11:11:08 +00:00
meson: Use run_command check: true for windows binary subprojects
Fixes a warning about using the check kwarg Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3224>
This commit is contained in:
parent
094b251901
commit
698503f5a7
2 changed files with 2 additions and 10 deletions
|
@ -6,11 +6,7 @@ message('Downloading and extracting win-flex-bison binaries...')
|
||||||
|
|
||||||
zip_hash = '8d324b62be33604b2c45ad1dd34ab93d722534448f55a16ca7292de32b6ac135'
|
zip_hash = '8d324b62be33604b2c45ad1dd34ab93d722534448f55a16ca7292de32b6ac135'
|
||||||
|
|
||||||
ret = run_command(py3, files('download-binary.py'), meson.project_version(), zip_hash)
|
ret = run_command(py3, files('download-binary.py'), meson.project_version(), zip_hash, check: true)
|
||||||
if ret.returncode() != 0
|
|
||||||
message(ret.stdout())
|
|
||||||
error(ret.stderr())
|
|
||||||
endif
|
|
||||||
|
|
||||||
meson.override_find_program('flex', find_program('win_flex'))
|
meson.override_find_program('flex', find_program('win_flex'))
|
||||||
meson.override_find_program('bison', find_program('win_bison'))
|
meson.override_find_program('bison', find_program('win_bison'))
|
||||||
|
|
|
@ -15,10 +15,6 @@ else
|
||||||
zip_hash = '2b8a00d9fa348e7b68bac0497e25be44db83c64d6681478fdcbfa03fca36ad76'
|
zip_hash = '2b8a00d9fa348e7b68bac0497e25be44db83c64d6681478fdcbfa03fca36ad76'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ret = run_command(py3, files('download-binary.py'), meson.project_version(), arch, zip_hash)
|
ret = run_command(py3, files('download-binary.py'), meson.project_version(), arch, zip_hash, check: true)
|
||||||
if ret.returncode() != 0
|
|
||||||
message(ret.stdout())
|
|
||||||
error(ret.stderr())
|
|
||||||
endif
|
|
||||||
|
|
||||||
meson.override_find_program('nasm', find_program(join_paths('nasm-@0@'.format(meson.project_version()), 'nasm')))
|
meson.override_find_program('nasm', find_program(join_paths('nasm-@0@'.format(meson.project_version()), 'nasm')))
|
||||||
|
|
Loading…
Reference in a new issue