aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoward Butler <howard@hobu.co>2019-09-19 15:00:46 -0500
committerHoward Butler <howard@hobu.co>2019-09-19 15:00:46 -0500
commit29ddc39d242b95c2de477a657bdceb703676a65e (patch)
treeecaa63a8cc1d430b01f3be69ce6ff0c2225f70a8
parent6be540696cb6672602f7118c8578b3df78455278 (diff)
downloadPROJ-29ddc39d242b95c2de477a657bdceb703676a65e.tar.gz
PROJ-29ddc39d242b95c2de477a657bdceb703676a65e.zip
address PR comments
-rw-r--r--appveyor.yml2
-rwxr-xr-xtravis/install.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml
index d1f5aa65..a631c3e8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -50,6 +50,8 @@ build_script:
test_script:
- echo test_script
+ - set PROJ_LIB=%PROJ_DIR%\share\proj
+ - cd %PROJ_LIB%
- curl -O https://download.osgeo.org/proj/proj-datumgrid-1.8.zip
- 7z e -aoa -y proj-datumgrid-1.8.zip
- cd %PROJ_BUILD%
diff --git a/travis/install.sh b/travis/install.sh
index e0367047..2363be43 100755
--- a/travis/install.sh
+++ b/travis/install.sh
@@ -84,8 +84,6 @@ cd build_cmake
cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/proj_cmake_install
VERBOSE=1 make -j${NPROC}
make install
-# The cmake build is not able to generate the null file, so copy it at hand
-cp /tmp/proj_autoconf_install_from_dist_all/share/proj/null /tmp/proj_cmake_install/share/proj
ctest
find /tmp/proj_cmake_install
cd ..