summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenny Levinsen <kl@kl.wtf>2022-01-11 11:35:44 +0100
committerSimon Ser <contact@emersion.fr>2022-01-16 19:26:57 +0100
commit02a69dde9f1f3a7bd1435effabf5fef9f78d8649 (patch)
tree1c3d41d7586aeff23ed0238906064f29f5ad95e9
parente0a591fb93a17e0a0f6ee8a8a285392d04a02c01 (diff)
meson: check: false on run_command
Future meson releases will change the default and warns when the implicit default is used, breaking builds. Explicitly set check: false to maintain behavior and silence warnings. (cherry picked from commit 470e04e8da6e078da77190998b5e0c34e244839a)
-rw-r--r--meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index e02cd2597..20452b3f9 100644
--- a/meson.build
+++ b/meson.build
@@ -156,8 +156,8 @@ add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir
version = '"@0@"'.format(meson.project_version())
git = find_program('git', native: true, required: false)
if git.found()
- git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'])
- git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'])
+ git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: false)
+ git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: false)
if git_commit.returncode() == 0 and git_branch.returncode() == 0
version = '"@0@-@1@ (" __DATE__ ", branch \'@2@\')"'.format(
meson.project_version(),