diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-11-14 17:40:42 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-11-14 22:48:29 +0100 |
| commit | d928db15d53805d9b728b440079756081961c536 (patch) | |
| tree | e862a961d26bedb34c58e4f28ef0bdeedb5f3225 /travis/install.sh | |
| parent | 330e8bf686f9c4524075ca1ff50cbca6c9e091da (diff) | |
| download | PROJ-d928db15d53805d9b728b440079756081961c536.tar.gz PROJ-d928db15d53805d9b728b440079756081961c536.zip | |
Implement RFC 2: Initial integration of "GDAL SRS barn" work
This work mostly consists of:
- a C++ implementation of the ISO-19111:2018 / OGC Topic 2
"Referencing by coordinates" classes to represent Datums,
Coordinate systems, CRSs (Coordinate Reference Systems) and
Coordinate Operations.
- methods to convert between this C++ modeling and WKT1, WKT2
and PROJ string representations of those objects
- management and query of a SQLite3 database of CRS and Coordinate Operation definition
- a C API binding part of those capabilities
This is all-in-one squashed commit of the work of
https://github.com/OSGeo/proj.4/pull/1040
Diffstat (limited to 'travis/install.sh')
| -rwxr-xr-x | travis/install.sh | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/travis/install.sh b/travis/install.sh index 98072d8a..6931986c 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -59,11 +59,16 @@ make install find /tmp/proj_autoconf_install_grids cd .. -# autoconf build with grids and coverage -if [ $TRAVIS_OS_NAME == "osx" ]; then - CFLAGS="--coverage" ./configure; +# There's an issue with the clang on Travis + coverage + cpp code +if [ "$BUILD_NAME" != "linux_clang" ]; then + # autoconf build with grids and coverage + if [ $TRAVIS_OS_NAME == "osx" ]; then + CFLAGS="--coverage" CXXFLAGS="--coverage" ./configure; + else + CFLAGS="$CFLAGS --coverage" CXXFLAGS="$CXXCFLAGS --coverage" LDFLAGS="$LDFLAGS -lgcov" ./configure; + fi else - CFLAGS="--coverage" LDFLAGS="-lgcov" ./configure; + ./configure fi make -j3 make check @@ -72,4 +77,6 @@ make check rm -v data/egm96_15.gtx make check -mv src/.libs/*.gc* src +if [ "$BUILD_NAME" != "linux_clang" ]; then + mv src/.libs/*.gc* src +fi |