aboutsummaryrefslogtreecommitdiff
path: root/appveyor.yml
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2017-03-13 22:03:43 +0100
committerKristian Evers <kristianevers@gmail.com>2017-03-13 22:03:43 +0100
commitfe1154e1a52b724f35d00c3d69b78dfda905d024 (patch)
tree235a0c0cf9a6dd4856f872276170b88cb52ecf59 /appveyor.yml
parentd7a0d2dee00dbbc08e455e884907c515cde94430 (diff)
downloadPROJ-fe1154e1a52b724f35d00c3d69b78dfda905d024.tar.gz
PROJ-fe1154e1a52b724f35d00c3d69b78dfda905d024.zip
Adjusting test script so it handles the differing file trees between cmake and nmake builds.
Diffstat (limited to 'appveyor.yml')
-rw-r--r--appveyor.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 70cf1bb0..d878c73d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -46,16 +46,16 @@ build_script:
test_script:
- echo test_script
- - if "%BUILD_TYPE%" == "nmake" set PROJDIR=C:\PROJ
- - if "%BUILD_TYPE%" == "cmake" set PROJDIR= C:\projects\proj-4
- - cd %PROJDIR%\nad
+ - if "%BUILD_TYPE%" == "cmake" set PROJ_LIB=C:\projects\proj-4\nad
+ - if "%BUILD_TYPE%" == "nmake" set PROJ_LIB=C:\PROJ\SHARE
+ - cd %PROJ_LIB%
- 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 -aoa -y proj-datumgrid-1.6.zip
- - cd %PROJDIR%\bin
+ - dir
+ - cd ..\bin
- echo "Contents of current directory:"
- dir
- - set PROJ_LIB=%PROJDIR%\nad
- proj.exe -VC
deploy: off