diff options
| author | Lzu Tao <taolzu@gmail.com> | 2019-04-30 05:25:40 (GMT) |
|---|---|---|
| committer | Lzu Tao <taolzu@gmail.com> | 2019-04-30 05:25:40 (GMT) |
| commit | cb1be75c84e9b49c82634fe9be5f968087c98df8 (patch) | |
| tree | 544a9476be3ad929f8f671fd842cbc8dc8685639 /contrib | |
| parent | dd54ea01a207a65d4819db4222066373f6170113 (diff) | |
| download | lz4-cb1be75c84e9b49c82634fe9be5f968087c98df8.zip lz4-cb1be75c84e9b49c82634fe9be5f968087c98df8.tar.gz lz4-cb1be75c84e9b49c82634fe9be5f968087c98df8.tar.bz2 | |
meson: Rely only on extracted version in lz4.h
So now instead of warning when failing to extract version number
from lz4.h, we error and stop the build instead.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/meson/meson.build | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/contrib/meson/meson.build b/contrib/meson/meson.build index 7e364eb..c28d90a 100644 --- a/contrib/meson/meson.build +++ b/contrib/meson/meson.build @@ -11,9 +11,7 @@ project('lz4', ['c'], license: ['BSD', 'GPLv2'], default_options : ['c_std=c99', 'buildtype=release'], - # Fall-back version in case of extracting version number from - # `lz4.h` failed. - version: '1.9.1', + version: 'DUMMY', meson_version: '>=0.47.0') cc = meson.get_compiler('c') @@ -40,13 +38,10 @@ lz4_h_file = join_paths(meson.current_source_dir(), '../../lib/lz4.h') GetLz4LibraryVersion_py = files('GetLz4LibraryVersion.py') r = run_command(python3, GetLz4LibraryVersion_py, lz4_h_file) if r.returncode() == 0 - output = r.stdout().strip() - if output.version_compare('>@0@'.format(lz4_version)) - lz4_version = output - message('Project version is now: @0@'.format(lz4_version)) - endif + lz4_version = r.stdout().strip() + message('Project version is now: @0@'.format(lz4_version)) else - warning('Cannot find project version in @0@'.format(lz4_h_file)) + error('Cannot find project version in @0@'.format(lz4_h_file)) endif lz4_libversion = lz4_version |