Skip to content

Commit cca2744

Browse files
committed
vagrant: fixes to make it work
1 parent e482938 commit cca2744

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

scripts/vagrant/packages.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ apt-get update
88
apt-get install -y python-software-properties
99
add-apt-repository -y ppa:ubuntugis/ppa
1010
add-apt-repository -y ppa:ubuntugis/ubuntugis-testing
11+
add-apt-repository -y ppa:dluxen/cmake-backports
1112
apt-get update
1213
apt-get -y upgrade
1314

1415
# install packages we need
15-
apt-get install -q -y git build-essential pkg-config cmake libgeos-dev rake \
16+
apt-get install -q -y git build-essential pkg-config cmake3 libgeos-dev rake \
1617
libpq-dev python-all-dev libproj-dev libxml2-dev postgis php5-dev \
1718
postgresql-server-dev-9.3 postgresql-9.3-postgis-2.2 vim bison flex swig \
1819
librsvg2-dev libpng12-dev libjpeg-dev libgif-dev \

scripts/vagrant/proj6.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ mv proj-6.1.1 vagrant-proj
1313
(cd vagrant-proj/data && curl -s http://download.osgeo.org/proj/proj-datumgrid-1.8.tar.gz > proj-datumgrid-1.8.tar.gz && tar xvzf proj-datumgrid-1.8.tar.gz)
1414
(cd vagrant-proj; CFLAGS='-DPROJ_RENAME_SYMBOLS -O2' CXXFLAGS='-DPROJ_RENAME_SYMBOLS -O2' ./configure --disable-static --prefix=/vagrant/install-vagrant-proj-6 && make -j $NUMTHREADS && make -j $NUMTHREADS install)
1515
cp -r /vagrant/install-vagrant-proj-6/include /vagrant/install-vagrant-proj-6/include_proj4_api_only
16-
rm /vagrant/install-vagrant-proj-6/include_proj4_api_only/proj.h
16+
rm -f /vagrant/install-vagrant-proj-6/include_proj4_api_only/proj.h

0 commit comments

Comments
 (0)