Skip to content

Commit d06859a

Browse files
committedJul 11, 2016
[travis] Modernize Mac OSX dependencies
1 parent c895ba3 commit d06859a

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed
 

‎.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
matrix:
22
fast_finish: true
3-
allow_failures:
4-
- os: osx
53
include:
64
# QT4 based build with Python 2.7 // using container based builds and prebuild binary dependencies in osgeo4travis
75
- os: linux

‎ci/travis/osx/before_install.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313
# #
1414
###########################################################################
1515

16+
# Remove default gdal provided by travis (we will replace it with gdal 2)
17+
brew remove gdal || true
18+
1619
brew tap osgeo/osgeo4mac
1720
brew update
18-
brew install osgeo/osgeo4mac/qgis-28 --without-postgis --without-postgresql --without-grass --without-gpsbabel --only-dependencies
19-
brew install qca
21+
brew install osgeo/osgeo4mac/qgis-214 --without-postgresql --only-dependencies
2022
brew install spawn-fcgi
2123
brew install lighttpd
2224
brew install poppler
@@ -31,6 +33,7 @@ brew ln libffi --force
3133

3234
mkdir -p ${HOME}/Library/Python/2.7/lib/python/site-packages
3335
echo 'import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")' >> ${HOME}/Library/Python/2.7/lib/python/site-packages/homebrew.pth
36+
echo 'import site; site.addsitedir("/usr/local/opt/gdal-20/lib/python2.7/site-packages")' >> ${HOME}/Library/Python/2.7/lib/python/site-packages/gdal2.pth
3437

3538
# Needed for Processing
3639
pip install psycopg2 numpy nose2 pyyaml mock future

‎ci/travis/osx/install.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,6 @@ cmake \
3030
-DWITH_PYSPATIALITE=ON \
3131
-DQWT_INCLUDE_DIR=/usr/local/opt/qwt/lib/qwt.framework/Headers/ \
3232
-DQWT_LIBRARY=/usr/local/opt/qwt/lib/qwt.framework/qwt \
33+
-DGDAL_CONFIG=/usr/local/opt/gdal-20/bin/gdal-config \
3334
-DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" \
3435
..

0 commit comments

Comments
 (0)
Please sign in to comment.