diff options
| author | Yann Collet <Cyan4973@users.noreply.github.com> | 2019-04-30 06:40:42 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-30 06:40:42 (GMT) |
| commit | 02914300185515097cdbebcd95c379508b5d3053 (patch) | |
| tree | 544a9476be3ad929f8f671fd842cbc8dc8685639 /contrib | |
| parent | ce55e7eef9ae60f11f8a8552a9dcde8ab6b99559 (diff) | |
| parent | cb1be75c84e9b49c82634fe9be5f968087c98df8 (diff) | |
| download | lz4-02914300185515097cdbebcd95c379508b5d3053.zip lz4-02914300185515097cdbebcd95c379508b5d3053.tar.gz lz4-02914300185515097cdbebcd95c379508b5d3053.tar.bz2 | |
Merge pull request #700 from lzutao/meson-non-failures
contrib: Make Meson build non optional
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/meson/meson.build | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/contrib/meson/meson.build b/contrib/meson/meson.build index bf30eae..c28d90a 100644 --- a/contrib/meson/meson.build +++ b/contrib/meson/meson.build @@ -11,7 +11,7 @@ project('lz4', ['c'], license: ['BSD', 'GPLv2'], default_options : ['c_std=c99', 'buildtype=release'], - version: '1.8.3', + version: 'DUMMY', meson_version: '>=0.47.0') cc = meson.get_compiler('c') @@ -38,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 |