Skip to content

Commit

Permalink
Change default b_ndebug value
Browse files Browse the repository at this point in the history
The value of setting this to "if-release" seems dubious. Additionally,
this allows more recent versions of Ubuntu to work without installing a
newer Meson.
  • Loading branch information
JPEWdev committed Apr 21, 2018
1 parent ce0e16e commit 2dd03ec
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ before_install:

script:
- docker run --rm icecream-sundae-$TEST_OS /bin/sh -c "CC=$CC CXX=$CXX
meson -Dwerror=true -Db_sanitize=address,undefined .. &&
meson -Db_ndebug=false -Dwerror=true -Db_sanitize=address,undefined .. &&
ninja &&
ninja test &&
ninja install"
3 changes: 0 additions & 3 deletions .travis/ubuntu-rolling/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@ RUN apt-get -y update && apt-get -y install \
libicecc-dev \
libncursesw5-dev \
meson \
python3-pip \
ninja-build

RUN pip3 install meson

RUN mkdir -p /root/icecream-sundae/builddir
COPY . /root/icecream-sundae/
WORKDIR /root/icecream-sundae/builddir/
Expand Down
3 changes: 2 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
project('icecream-sundae', 'cpp',
version: '0.99.0',
meson_version: '>= 0.31.0',
default_options: [
'buildtype=debugoptimized',
'cpp_std=c++14',
'warning_level=3',
'b_ndebug=if-release',
'b_ndebug=true',
])

icecc = dependency('icecc')
Expand Down

0 comments on commit 2dd03ec

Please sign in to comment.