From 2eac355c7354547a7b1038fe3ebb661a1c7b302f Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Tue, 7 Apr 2020 21:07:09 +1200 Subject: Test GCC 4.8 and CMake 3.9; resolve a few shadowed declaration warnings --- travis/linux_gcc/before_install.sh | 1 + travis/linux_gcc/install.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'travis/linux_gcc') diff --git a/travis/linux_gcc/before_install.sh b/travis/linux_gcc/before_install.sh index 9db2ea89..3068794d 100755 --- a/travis/linux_gcc/before_install.sh +++ b/travis/linux_gcc/before_install.sh @@ -17,5 +17,6 @@ scripts/doxygen.sh pip3 install --user sphinxcontrib-bibtex pip3 install --user cpp-coveralls +pip3 install --user cmake==3.9.6 ./travis/docker.sh diff --git a/travis/linux_gcc/install.sh b/travis/linux_gcc/install.sh index e7d4377e..5dd97f07 100755 --- a/travis/linux_gcc/install.sh +++ b/travis/linux_gcc/install.sh @@ -5,4 +5,4 @@ set -e export CCACHE_CPP2=yes export PROJ_DB_CACHE_DIR="$HOME/.ccache" -CC="ccache gcc" CXX="ccache g++" CFLAGS="-std=c99 -Werror" CXXFLAGS="-Werror" ./travis/install.sh +CC="ccache $CC" CXX="ccache $CXX" CFLAGS="-std=c99 -Werror" CXXFLAGS="-Werror" ./travis/install.sh -- cgit v1.2.3