From d54a5aec9449a7376949217747d62ada945f72cb Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Sat, 22 Dec 2018 13:33:48 -0500 Subject: [PATCH] Squashed '3rdparty/toluapp/' changes from 2e0e8533..e0f18471 e0f18471 Merge pull request #2 from brndnmtthws/fix-build-with-wall-werror 572e7f59 Enable -Wall -Werror on travis build. git-subtree-dir: 3rdparty/toluapp git-subtree-split: e0f18471d7eed84e2916713a86e0688fb95fa48f --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b873cfe9..23420aeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,7 +80,8 @@ before_install: - eval "${MATRIX_EVAL}" # Combine global build options with OS/compiler-dependent options - export CMAKE_OPTIONS="${CMAKE_OPTIONS} ${ENV_CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache" - - export CXX_FLAGS="${CXX_FLAGS} ${ENV_CXX_FLAGS}" + - export CXX_FLAGS="${CXX_FLAGS} ${ENV_CXX_FLAGS} -Wall -Werror -Wextra -Wunused -pedantic" + - export C_FLAGS="${C_FLAGS} ${ENV_C_FLAGS} -Wall -Werror -Wextra -Wunused -pedantic" install: - echo ${PATH} @@ -91,7 +92,7 @@ install: script: - mkdir -p build - cd build - - cmake ${CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS=${CXX_FLAGS} .. + - cmake ${CMAKE_OPTIONS} -DCMAKE_C_FLAGS=${C_FLAGS} -DCMAKE_CXX_FLAGS=${CXX_FLAGS} .. - make -j4 # Only watch the master branch