mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 18:33:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Travis: build macOS against Qt 5.11.1

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-07-09 10:50:52 -07:00
parent e928c829d3
commit 066e01f66d
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/mac/before_install.sh
View file

@ -40,14 +40,12 @@ sudo ln -s /usr/local/include/hidapi /usr/local/include/libusb-1.0/hidapi
pushd ${TRAVIS_BUILD_DIR}
mkdir -p Qt/5.9.1
mkdir -p Qt/5.11.1
echo "Get custom Qt build and unpack it"
curl --output ${TRAVIS_BUILD_DIR}/Qt-5.9.1-mac.tar.xz \
https://storage.googleapis.com/travis-cache/Qt-5.9.1-mac.tar.xz
# wget -q http://subsurface-divelog.org/downloads/Qt-5.9.1-mac.tar.xz
tar -xJ -C Qt/5.9.1 -f Qt-5.9.1-mac.tar.xz
curl --output Qt-5.11.1-mac.tar.xz \
https://storage.googleapis.com/travis-cache/Qt-5.11.1-mac.tar.xz
md5 Qt-5.11.1-mac.tar.xz
tar -xJ -C Qt/5.11.1 -f Qt-5.11.1-mac.tar.xz
sudo mkdir -p /Users/hohndel
sudo ln -s ${TRAVIS_BUILD_DIR}//Qt/5.9.1 /Users/hohndel/Qt5.9.1
ls -l /Users/hohndel

4
scripts/mac/travisbuild.sh
View file

@ -6,7 +6,7 @@ set -e
# this gets executed by Travis when building an App for Mac
# it gets started from inside the subsurface directory
export QT_ROOT=${TRAVIS_BUILD_DIR}/Qt/5.9.1
export QT_ROOT=${TRAVIS_BUILD_DIR}/Qt/5.11.1/clang_64
export PATH=$QT_ROOT/bin:$PATH # Make sure correct qmake is found on the $PATH
export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
@ -15,7 +15,7 @@ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
cd ${TRAVIS_BUILD_DIR}/..
DIR=$(pwd)
bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit
bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit -release
cd ${TRAVIS_BUILD_DIR}/build