diff options
| author | Yann Collet <Cyan4973@users.noreply.github.com> | 2022-01-29 00:57:18 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-29 00:57:18 (GMT) |
| commit | b2256c072ed75d5a557cf635a229752c2852e4e8 (patch) | |
| tree | 3d52feb2128581e44e1cc02fe1e9284ce87590ef | |
| parent | 5cc311893f1c94fe37e4151170d5a810c51c3330 (diff) | |
| parent | e7e5dd883a8dc379bc425ec2f4df3128f1ae15f4 (diff) | |
| download | lz4-b2256c072ed75d5a557cf635a229752c2852e4e8.zip lz4-b2256c072ed75d5a557cf635a229752c2852e4e8.tar.gz lz4-b2256c072ed75d5a557cf635a229752c2852e4e8.tar.bz2 | |
Merge pull request #1049 from eli-schwartz/meson-warning-run_command
meson: simplify version lookup and avoid deprecation warnings
| -rw-r--r-- | contrib/meson/meson/meson.build | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/contrib/meson/meson/meson.build b/contrib/meson/meson/meson.build index b278b7c..2cfd48c 100644 --- a/contrib/meson/meson/meson.build +++ b/contrib/meson/meson/meson.build @@ -28,13 +28,8 @@ lz4_version = meson.project_version() lz4_h_file = join_paths(meson.current_source_dir(), '../../../lib/lz4.h') GetLz4LibraryVersion_py = find_program('GetLz4LibraryVersion.py', native : true) -r = run_command(GetLz4LibraryVersion_py, lz4_h_file) -if r.returncode() == 0 - lz4_version = r.stdout().strip() - message('Project version is now: @0@'.format(lz4_version)) -else - error('Cannot find project version in @0@'.format(lz4_h_file)) -endif +lz4_version = run_command(GetLz4LibraryVersion_py, lz4_h_file, check: true).stdout().strip() +message('Project version is now: @0@'.format(lz4_version)) lz4_libversion = lz4_version |