Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Reenable fcgi and server on osx (followup 53d40e8)
  • Loading branch information
jef-n committed Mar 23, 2016
1 parent 9767bd0 commit 40611d7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions ci/travis/osx/before_install.sh
@@ -1,9 +1,9 @@
brew tap osgeo/osgeo4mac
brew update
brew install osgeo/osgeo4mac/qgis-28 --without-postgis --without-postgresql --without-grass --without-gpsbabel --only-dependencies --without-server
brew install osgeo/osgeo4mac/qgis-28 --without-postgis --without-postgresql --without-grass --without-gpsbabel --only-dependencies
brew install qca
#brew install spawn-fcgi
#brew install lighttpd
brew install spawn-fcgi
brew install lighttpd
brew install poppler

brew ln bison --force
Expand Down
2 changes: 1 addition & 1 deletion ci/travis/osx/install.sh
Expand Up @@ -3,7 +3,7 @@ cd build
#no PGTEST for OSX - can't get postgres to start with brew install
#no APIDOC for OSX - doxygen tests and warnings are covered by linux build
#no deprecated-declarations warnings... requires QGIS ported to Cocoa
cmake -DWITH_SERVER=OFF -DWITH_STAGED_PLUGINS=ON -DWITH_GRASS=OFF \
cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=ON -DWITH_GRASS=OFF \
-DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON -DENABLE_PGTEST=OFF \
-DWITH_QWTPOLAR=OFF -DWITH_PYSPATIALITE=ON \
-DQWT_INCLUDE_DIR=/usr/local/opt/qwt/lib/qwt.framework/Headers/ \
Expand Down

1 comment on commit 40611d7

@m-kuhn
Copy link
Member

@m-kuhn m-kuhn commented on 40611d7 Mar 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, no git access a.t.m.
can you backport this to 2.14 also?
Thx

Please sign in to comment.