From 90ccf5b42baedac1fd2bbd9a4265737063e959a3 Mon Sep 17 00:00:00 2001 From: Nikolay Kasyanov Date: Wed, 20 Jun 2018 19:59:55 +0200 Subject: [PATCH] [macOS, CI] Build using macOS 10.13 SDK --- .travis.yml | 2 +- CI/before_install.osx.sh | 2 +- CI/before_script.osx.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 02cc7cf20..7d2e6a795 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ os: - linux - osx -osx_image: xcode8.3 +osx_image: xcode9.4 language: cpp sudo: required dist: trusty diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index 86e8fb81b..47f4021cf 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -6,5 +6,5 @@ brew outdated cmake || brew upgrade cmake brew outdated pkgconfig || brew upgrade pkgconfig brew install $macos_qt_formula -curl https://downloads.openmw.org/osx/dependencies/openmw-deps-c40905f.zip -o ~/openmw-deps.zip +curl https://downloads.openmw.org/osx/dependencies/openmw-deps-100d2e0.zip -o ~/openmw-deps.zip unzip ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh index 806b545e3..2d1cf8729 100755 --- a/CI/before_script.osx.sh +++ b/CI/before_script.osx.sh @@ -11,7 +11,7 @@ cd build cmake \ -D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT;$QT_PATH" \ -D CMAKE_OSX_DEPLOYMENT_TARGET="10.9" \ --D CMAKE_OSX_SYSROOT="macosx10.12" \ +-D CMAKE_OSX_SYSROOT="macosx10.13" \ -D CMAKE_BUILD_TYPE=Release \ -D OPENMW_OSX_DEPLOYMENT=TRUE \ -D DESIRED_QT_VERSION=5 \