mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
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>
This commit is contained in:
parent
186fa6c489
commit
b68b42bd2f
2 changed files with 5 additions and 6 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue