diff options
| author | Yann Collet <Cyan4973@users.noreply.github.com> | 2019-01-11 20:11:35 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 20:11:35 (GMT) |
| commit | bc85de6ec9dc57ce3f163312b83b8ebd9229f574 (patch) | |
| tree | 42e424e77ef4ea3e7514c969299f154aa76906f9 | |
| parent | 94afb9a87b5cf956c9c59bd2a513eaf586effe9d (diff) | |
| parent | d2288d2cc0ed47b3531d5ff97eea2e74a6612aa3 (diff) | |
| download | lz4-bc85de6ec9dc57ce3f163312b83b8ebd9229f574.zip lz4-bc85de6ec9dc57ce3f163312b83b8ebd9229f574.tar.gz lz4-bc85de6ec9dc57ce3f163312b83b8ebd9229f574.tar.bz2 | |
Merge pull request #639 from lzutao/meson
meson: Small improvements
| -rw-r--r-- | contrib/meson/README.md | 2 | ||||
| -rw-r--r-- | contrib/meson/lib/meson.build | 4 | ||||
| -rw-r--r-- | contrib/meson/meson.build | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/contrib/meson/README.md b/contrib/meson/README.md index 4e55ab9..fa18493 100644 --- a/contrib/meson/README.md +++ b/contrib/meson/README.md @@ -13,7 +13,7 @@ This Meson build system is provided with no guarantee. `cd` to this meson directory (`contrib/meson`) ```sh -meson --buildtype=release -Ddefault_library=shared -Dbuild_programs=true builddir +meson setup --buildtype=release -Ddefault_library=shared -Dbuild_programs=true builddir cd builddir ninja # to build ninja install # to install diff --git a/contrib/meson/lib/meson.build b/contrib/meson/lib/meson.build index ff7a703..f1deb58 100644 --- a/contrib/meson/lib/meson.build +++ b/contrib/meson/lib/meson.build @@ -37,9 +37,9 @@ liblz4 = library('lz4', liblz4_dep = declare_dependency(link_with: liblz4, include_directories: liblz4_includes) -pkgconfig.generate(name: 'lz4', +pkgconfig.generate(liblz4, + name: 'lz4', filebase: 'liblz4', - libraries: [liblz4], description: 'extremely fast lossless compression algorithm library', version: lz4_libversion, url: 'http://www.lz4.org/') diff --git a/contrib/meson/meson.build b/contrib/meson/meson.build index d618eb4..e25e7c0 100644 --- a/contrib/meson/meson.build +++ b/contrib/meson/meson.build @@ -43,7 +43,7 @@ if r.returncode() == 0 message('Project version is now: @0@'.format(lz4_version)) endif else - message('Cannot find project version in @0@'.format(lz4_h_file)) + warning('Cannot find project version in @0@'.format(lz4_h_file)) endif lz4_libversion = lz4_version |