From: Lzu Tao <taolzu@gmail.com>
Date: Fri, 26 Apr 2019 18:41:03 +0000 (+0700)
Subject: contrib: Make Meson build non optional
X-Git-Tag: upstream/1.9.3~2^2~39^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd54ea01a207a65d4819db4222066373f6170113;p=platform%2Fupstream%2Flz4.git

contrib: Make Meson build non optional

* Update ninja version to 1.9 in CI.
* Update default project version in meson script.
---

diff --git a/.travis.yml b/.travis.yml
index c684b6c..8ebcdfa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -172,13 +172,13 @@ matrix:
         - tests/checkTag "$TRAVIS_BRANCH"
 
     - name: (Xenial) Meson + clang build
-      env: ALLOW_FAILURES=true
+      #env: ALLOW_FAILURES=true
       dist: xenial
       language: cpp
       compiler: clang
       install:
         - sudo apt-get install -qq python3 tree
-        - curl -o ~/ninja.zip -L 'https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip'
+        - curl -o ~/ninja.zip -L 'https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip'
             && unzip ~/ninja.zip -d ~/.local/bin
         - curl -o ~/get-pip.py 'https://bootstrap.pypa.io/get-pip.py'
             && python3 ~/get-pip.py --user
@@ -191,7 +191,7 @@ matrix:
             -Ddefault_library=both
             -Dbuild_{programs,contrib,tests,examples}=true
             contrib/meson build
-        - cd build
+        - pushd build
         - DESTDIR=./staging ninja install
         - tree ./staging
   allow_failures:
diff --git a/contrib/meson/meson.build b/contrib/meson/meson.build
index bf30eae..7e364eb 100644
--- a/contrib/meson/meson.build
+++ b/contrib/meson/meson.build
@@ -11,7 +11,9 @@ project('lz4', ['c'],
   license: ['BSD', 'GPLv2'],
   default_options : ['c_std=c99',
     'buildtype=release'],
-  version: '1.8.3',
+  # Fall-back version in case of extracting version number from
+  # `lz4.h` failed.
+  version: '1.9.1',
   meson_version: '>=0.47.0')
 
 cc = meson.get_compiler('c')