diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2015-07-11 00:02:10 +0100 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2015-07-11 00:02:10 +0100 |
| commit | d49267ca3fc0aeaa1b45f48be8f48453be54a6a9 (patch) | |
| tree | 2fc585ba2c4fbaabcb7080e7e7a8ec1df618be77 /.travis.yml | |
| parent | f815209c7de45103f8d983fd71356323c52b2851 (diff) | |
| download | swig-d49267ca3fc0aeaa1b45f48be8f48453be54a6a9.tar.gz | |
Fix compile flags for Travis C++11 testing
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 5ca17c7ad..860360266 100644 --- a/.travis.yml +++ b/.travis.yml @@ -115,8 +115,8 @@ before_install: - if test "$SWIGLANG" = "r"; then sudo apt-get -qq install r-base; fi - if test "$SWIGLANG" = "scilab"; then sudo apt-get -qq install scilab; fi - if test "$SWIGLANG" = "tcl"; then sudo apt-get -qq install tcl8.4-dev; fi - - if test -n "$CPP11"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++11 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra"); fi - - if test -n "$CPP14"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++14 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra"); fi + - if test -n "$CPP11"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++11 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra") && export CSTD=c11 && export CPPSTD=c++11; fi + - if test -n "$CPP14"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++14 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra") && export CSTD=c11 && export CPPSTD=c++14; fi - $CC --version - $CXX --version # Stricter compile flags for examples. Various headers and SWIG generated code prevents full use of -pedantic. |