diff options
| author | John Szakmeister <john@szakmeister.net> | 2014-05-14 19:08:41 -0400 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2014-05-29 17:37:12 -0400 |
| commit | a581173e715af4f7ef4e6be232ed828bd7dea9b8 (patch) | |
| tree | ce6c449e7fa8db4eeacbfd1321178121131f148d | |
| parent | 79a96ec1a4b510fc111ab808371ef0a6010ce4a4 (diff) | |
| download | rneovim-a581173e715af4f7ef4e6be232ed828bd7dea9b8.tar.gz rneovim-a581173e715af4f7ef4e6be232ed828bd7dea9b8.tar.bz2 rneovim-a581173e715af4f7ef4e6be232ed828bd7dea9b8.zip | |
Turn off -Werror by default.
It inteferes with development activities by breaking your build in the
middle of a refactor. Instead, let's enable -Werror on the Travis CI
builds via a TRAVIS_CI_BUILD option.
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rwxr-xr-x | scripts/travis.sh | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a29d8d6834..abb2bdf248 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,15 @@ set(NEOVIM_VERSION_PATCH 0) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -add_definitions(-Werror -Wall -Wextra -pedantic -Wno-unused-parameter -std=gnu99) +add_definitions(-Wall -Wextra -pedantic -Wno-unused-parameter -std=gnu99) + +option( + TRAVIS_CI_BUILD "Travis CI build. Extra compilation flags will be set." OFF) + +if(TRAVIS_CI_BUILD) + message(STATUS "Travis CI build enabled.") + add_definitions(-Werror) +endif() add_definitions(-DHAVE_CONFIG_H) if(CMAKE_BUILD_TYPE MATCHES Debug) diff --git a/scripts/travis.sh b/scripts/travis.sh index 2b97773b22..b6632acb10 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -121,7 +121,7 @@ if [ "$TRAVIS_BUILD_TYPE" = "clang/asan" ]; then export SKIP_UNITTEST=1 export UBSAN_OPTIONS="log_path=$tmpdir/ubsan" # not sure if this works - $MAKE_CMD cmake CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$install_dir -DUSE_GCOV=ON" + $MAKE_CMD cmake CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DCMAKE_INSTALL_PREFIX=$install_dir -DUSE_GCOV=ON" $MAKE_CMD if ! $MAKE_CMD test; then reset @@ -136,7 +136,7 @@ elif [ "$TRAVIS_BUILD_TYPE" = "gcc/unittest" ]; then export CC=gcc set_environment /opt/neovim-deps export SKIP_EXEC=1 - $MAKE_CMD CMAKE_EXTRA_FLAGS="-DBUSTED_OUTPUT_TYPE=TAP -DUSE_GCOV=ON" unittest + $MAKE_CMD CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=TAP -DUSE_GCOV=ON" unittest coveralls --encoding iso-8859-1 || echo 'coveralls upload failed.' elif [ "$TRAVIS_BUILD_TYPE" = "gcc/ia32" ]; then set_environment /opt/neovim-deps/32 @@ -159,7 +159,7 @@ elif [ "$TRAVIS_BUILD_TYPE" = "gcc/ia32" ]; then # correctly. sudo apt-get install libncurses5-dev:i386 - $MAKE_CMD CMAKE_EXTRA_FLAGS="-DBUSTED_OUTPUT_TYPE=TAP -DCMAKE_TOOLCHAIN_FILE=cmake/i386-linux-gnu.toolchain.cmake" unittest + $MAKE_CMD CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=TAP -DCMAKE_TOOLCHAIN_FILE=cmake/i386-linux-gnu.toolchain.cmake" unittest $MAKE_CMD test elif [ "$TRAVIS_BUILD_TYPE" = "clint" ]; then ./scripts/clint.sh |