diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2017-03-13 10:58:46 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2017-03-13 10:58:46 +0100 |
| commit | c743196ae60ac31be34efd385a1d5d81e4be7c82 (patch) | |
| tree | 3bba6d4eaa7f9e5d37c4110e02438ee9a1d77ac4 | |
| parent | 59027eec7ad2d2a6d835633b99be14e21675c3a5 (diff) | |
| download | PROJ-c743196ae60ac31be34efd385a1d5d81e4be7c82.tar.gz PROJ-c743196ae60ac31be34efd385a1d5d81e4be7c82.zip | |
(attempt at) fixing grid dirs in appveyor/travis setup
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rwxr-xr-x | travis/install.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml index 68568e82..3a2cae38 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -48,7 +48,7 @@ test_script: - echo test_script - if "%BUILD_TYPE%" == "nmake" set PROJDIR=C:\PROJ\bin - if "%BUILD_TYPE%" == "cmake" set PROJDIR= C:\projects\proj-4\bin - - cd %PROJDR%\nad + - cd %PROJDIR%\nad - curl -O http://download.osgeo.org/proj/proj-datumgrid-1.6.zip - curl -O http://download.osgeo.org/proj/vdatum/egm96_15/egm96_15.gtx - 7z e proj-datumgrid-1.6.zip diff --git a/travis/install.sh b/travis/install.sh index b9764612..70b8e90d 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -47,6 +47,8 @@ wget http://download.osgeo.org/proj/proj-datumgrid-1.6.zip cd nad unzip -o ../proj-datumgrid-1.6.zip wget http://download.osgeo.org/proj/vdatum/egm96_15/egm96_15.gtx +GRIDDIR=`pwd` +echo $GRIDDIR cd .. # cmake build with grids mkdir build_cmake_nad @@ -78,7 +80,7 @@ if [ $TRAVIS_OS_NAME == "osx" ]; then fi make -j3 make check -PROJ_LIB=../nad ./src/proj -VC +PROJ_LIB=$GRIDDIR ./src/proj -VC # install & run the working GIGS test # create locations that pyproj understands |