diff options
| author | Mike Taves <mwtoews@gmail.com> | 2020-04-07 21:07:09 +1200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-04-07 22:01:10 +0200 |
| commit | 2eac355c7354547a7b1038fe3ebb661a1c7b302f (patch) | |
| tree | 38068aedfdd32599961344278ea2af5f3db3cea8 /travis | |
| parent | 0853daaeb117c227db9c648785f3f81ef85956a3 (diff) | |
| download | PROJ-2eac355c7354547a7b1038fe3ebb661a1c7b302f.tar.gz PROJ-2eac355c7354547a7b1038fe3ebb661a1c7b302f.zip | |
Test GCC 4.8 and CMake 3.9; resolve a few shadowed declaration warnings
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/install.sh | 1 | ||||
| -rwxr-xr-x | travis/linux_gcc/before_install.sh | 1 | ||||
| -rwxr-xr-x | travis/linux_gcc/install.sh | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/travis/install.sh b/travis/install.sh index 8a434264..aca1624b 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -103,6 +103,7 @@ if [ "$BUILD_NAME" != "linux_gcc8" ]; then # cmake build from generated tarball mkdir build_cmake cd build_cmake + cmake --version cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/proj_cmake_install VERBOSE=1 make make install 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 |