build(meson): fix deprecation warnings

This commit is contained in:
Jeremy Attali 2022-11-20 17:17:21 -05:00 committed by Jeremy Attali
parent cfc79d44ed
commit 05e9aede16
3 changed files with 5 additions and 5 deletions

View File

@ -12,7 +12,7 @@ jobs:
sudo apt-get update
sudo apt --yes install libgtk-3-dev meson ninja-build scdoc
pkg-config --list-all
CC=gcc meson build
CC=gcc meson setup build
ninja -C build
build-clang:
@ -23,7 +23,7 @@ jobs:
run: |
sudo apt-get update
sudo apt --yes install libgtk-3-dev meson ninja-build scdoc clang clang-format clang-tidy
CC=clang meson build
CC=clang meson setup build
ninja -C build
echo "Making sure clang-format is correct..."
git ls-files -- '*.[ch]' | xargs clang-format -Werror -n

View File

@ -133,7 +133,7 @@ Optional dependencies:
Then run:
```sh
meson build
meson setup build
ninja -C build
```

View File

@ -14,8 +14,8 @@ project(
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:true)
git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check:true)
if git_commit.returncode() == 0 and git_branch.returncode() == 0
version = '"@0@-@1@ (" __DATE__ ", branch \'@2@\')"'.format(
meson.project_version(),