meson: specify check: false on run_command
We use run_command for conditionals, meaning meson execution should not stop when the command returns false. This change keeps our meson setup working throughout the upcoming change of default behavior (check: true).
This commit is contained in:
parent
16f83396b4
commit
90d7b9769c
@ -13,10 +13,10 @@ project(
|
|||||||
# TODO(https://github.com/i3/i3/issues/4087): switch to
|
# TODO(https://github.com/i3/i3/issues/4087): switch to
|
||||||
# 'buildtype=debugoptimized',
|
# 'buildtype=debugoptimized',
|
||||||
],
|
],
|
||||||
# Ubuntu 18.04 (supported until 2023) has meson 0.45.
|
# Ubuntu 20.04 (supported until 2025) has meson 0.53.
|
||||||
# We can revisit our minimum supported meson version
|
# We can revisit our minimum supported meson version
|
||||||
# if it turns out to be too hard to maintain.
|
# if it turns out to be too hard to maintain.
|
||||||
meson_version: '>=0.45.0',
|
meson_version: '>=0.47.0',
|
||||||
)
|
)
|
||||||
|
|
||||||
cc = meson.get_compiler('c')
|
cc = meson.get_compiler('c')
|
||||||
@ -125,7 +125,7 @@ if get_option('docs')
|
|||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
else
|
else
|
||||||
if run_command('[', '-f', 'docs/hacking-howto.html', ']').returncode() == 0
|
if run_command('[', '-f', 'docs/hacking-howto.html', ']', check: false).returncode() == 0
|
||||||
install_data(
|
install_data(
|
||||||
[
|
[
|
||||||
'docs/hacking-howto.html',
|
'docs/hacking-howto.html',
|
||||||
@ -269,7 +269,7 @@ if get_option('mans')
|
|||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
else
|
else
|
||||||
if run_command('[', '-f', 'man/i3.1', ']').returncode() == 0
|
if run_command('[', '-f', 'man/i3.1', ']', check: false).returncode() == 0
|
||||||
install_data(
|
install_data(
|
||||||
[
|
[
|
||||||
'man/i3.1',
|
'man/i3.1',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user