diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | meson.build | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 90f9ec40e12..079f145a7e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -490,10 +490,9 @@ before_install: install: # Install a more modern meson from pip, since the version in the - # ubuntu repos is often quite old. Avoid >=0.45.0 as it needs python - # 3.5+ + # ubuntu repos is often quite old. - if test "x$BUILD" = xmeson; then - pip3 install --user "meson<0.45.0"; + pip3 install --user meson; pip3 install --user mako; fi diff --git a/meson.build b/meson.build index 909d46a7428..0d534b9b4a9 100644 --- a/meson.build +++ b/meson.build @@ -25,8 +25,8 @@ project( [find_program('python', 'python2', 'python3'), 'bin/meson_get_version.py'] ).stdout(), license : 'MIT', - meson_version : '>= 0.44.1', - default_options : ['buildtype=debugoptimized', 'c_std=c99', 'cpp_std=c++11'] + meson_version : '>= 0.45', + default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c99', 'cpp_std=c++11'] ) cc = meson.get_compiler('c') |