1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-26 12:27:52 +00:00

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
This commit is contained in:
Brenden Matthews 2018-12-22 13:33:48 -05:00
parent 4fc4128ffa
commit d54a5aec94

View File

@ -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