diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-05-19 06:14:57 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-05-19 14:14:37 -0700 |
| commit | b68b42bd2f9d995ec76a791e6cf1322590f065fe (patch) | |
| tree | 7293c3fb30a26276fe04d82ce26fa765b319d010 /scripts/mac | |
| parent | 186fa6c48942cac366e86fcf2ae74c534fba4269 (diff) | |
| download | subsurface-b68b42bd2f9d995ec76a791e6cf1322590f065fe.tar.gz | |
Travis: build macOS test against Qt 5.12.3
The .app.zip should once again run on any Mac (ignoring the security issue of
unsigned binaries). The Qt binaries in that archive include the jpeg and png
libraries that were missing in the Qt 5.11.1 binaries we used until now.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/mac')
| -rw-r--r-- | scripts/mac/before_install.sh | 9 | ||||
| -rw-r--r-- | scripts/mac/travisbuild.sh | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/scripts/mac/before_install.sh b/scripts/mac/before_install.sh index 583c82daa..8dfa04231 100644 --- a/scripts/mac/before_install.sh +++ b/scripts/mac/before_install.sh @@ -23,12 +23,11 @@ git describe pushd ${TRAVIS_BUILD_DIR} -mkdir -p Qt/5.11.1 +mkdir -p Qt/5.12.3 echo "Get custom Qt build and unpack it" -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 +curl --output Qt-5.12.3-mac.tar.xz \ + https://storage.googleapis.com/travis-cache/Qt-5.12.3-mac.tar.xz -tar -xJ -C Qt/5.11.1 -f Qt-5.11.1-mac.tar.xz +tar -xJ -C Qt/5.12.3 -f Qt-5.12.3-mac.tar.xz diff --git a/scripts/mac/travisbuild.sh b/scripts/mac/travisbuild.sh index 896f6fb1f..2ffe51d6b 100644 --- a/scripts/mac/travisbuild.sh +++ b/scripts/mac/travisbuild.sh @@ -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.11.1/clang_64 +export QT_ROOT=${TRAVIS_BUILD_DIR}/Qt/5.12.3/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 |