mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Travis: update build options

Browse source 
This pulls the latest .travis.yml from master. Which among other things uses a
new tool chain for Mac. Which requires some changes to the Travis Mac build
script.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2019-04-08 19:47:12 +03:00
parent 95326274be
commit d43032f01f
2 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scripts/mac/before_install.sh
View file

@ -15,23 +15,6 @@ git fetch --unshallow
git pull --tags
git describe
# for our build we need an updated Homebrew with a few more components
# installed.
#
# in the past that was brutally slow, but now this is quite fast, so we
# no longer bother with trying to cache the binaries - the raw download
# takes longer than updating / installing from Homebrew
brew update
echo "Updated Homebrew, now get our dependencies brewed"
brew install xz hidapi libusb libxml2 libxslt libzip openssl pkg-config libgit2 libssh2
# libdivecomputer uses the wrong include path for libusb and hidapi
# the pkgconfig file for libusb/hidapi already gives the include path as
# ../include/libusb-1.0 (../include/hidapi) yet libdivecomputer wants to use
# include <libusb-1.0/libusb.h> and include <hidapi/hidapi.h>
sudo ln -s /usr/local/include/libusb-1.0 /usr/local/include/libusb-1.0/libusb-1.0
sudo ln -s /usr/local/include/hidapi /usr/local/include/libusb-1.0/hidapi
# prep things so we can build for Mac
# we have a custom built Qt some gives us just what we need, including QtWebKit
#