aboutsummaryrefslogtreecommitdiff
path: root/travis
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@mines-paris.org>2017-02-27 15:46:04 +0100
committerGitHub <noreply@github.com>2017-02-27 15:46:04 +0100
commitb36451fff0bd69b4a14241a8007a0d40caaf8896 (patch)
treecbbef143301fda599c33d139c3fbbfa913754fb1 /travis
parentd64a5508c1efbc1ca6e126d959e19cf879462863 (diff)
parent0cbb3c200d467a520783b07c0774bf3c62cac9b9 (diff)
downloadPROJ-b36451fff0bd69b4a14241a8007a0d40caaf8896.tar.gz
PROJ-b36451fff0bd69b4a14241a8007a0d40caaf8896.zip
Merge pull request #495 from rouault/misc_warning_fixes
Fix warnings related to -Wshadow -Wnull-dereference -Wfloat-conversion -Wmissing-prototypes -Wmissing-declarations
Diffstat (limited to 'travis')
-rwxr-xr-xtravis/install.sh1
-rwxr-xr-xtravis/linux_clang/install.sh2
-rwxr-xr-xtravis/linux_gcc/install.sh3
-rwxr-xr-xtravis/osx/install.sh2
4 files changed, 5 insertions, 3 deletions
diff --git a/travis/install.sh b/travis/install.sh
index 17280451..41f9fcb6 100755
--- a/travis/install.sh
+++ b/travis/install.sh
@@ -88,6 +88,7 @@ mkdir share
ln -s nad share/proj
pwd
# install pyproj
+export CFLAGS=
PROJ_DIR=`pwd` pip3 install -v --user pyproj
cd test/gigs
diff --git a/travis/linux_clang/install.sh b/travis/linux_clang/install.sh
index fad21a16..56e16ce6 100755
--- a/travis/linux_clang/install.sh
+++ b/travis/linux_clang/install.sh
@@ -4,4 +4,4 @@ set -e
export CCACHE_CPP2=yes
-CC="ccache clang" ./travis/install.sh
+CC="ccache clang" CFLAGS="-g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -Wfloat-conversion -O2" ./travis/install.sh
diff --git a/travis/linux_gcc/install.sh b/travis/linux_gcc/install.sh
index f5e12dbd..571e02b7 100755
--- a/travis/linux_gcc/install.sh
+++ b/travis/linux_gcc/install.sh
@@ -4,4 +4,5 @@ set -e
export CCACHE_CPP2=yes
-CC="ccache gcc" ./travis/install.sh
+# -Wfloat-conversion not available for gcc 4.8
+CC="ccache gcc" CFLAGS="-g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -O2" ./travis/install.sh
diff --git a/travis/osx/install.sh b/travis/osx/install.sh
index fad21a16..56e16ce6 100755
--- a/travis/osx/install.sh
+++ b/travis/osx/install.sh
@@ -4,4 +4,4 @@ set -e
export CCACHE_CPP2=yes
-CC="ccache clang" ./travis/install.sh
+CC="ccache clang" CFLAGS="-g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -Wfloat-conversion -O2" ./travis/install.sh