From c99d9a47e8725f907e589a9b1a6cfbda6a8ede87 Mon Sep 17 00:00:00 2001 From: Nikolay Kasyanov Date: Sun, 30 Oct 2016 19:30:54 +0100 Subject: [PATCH 1/2] [OS X] Reenable CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4f811ee0f..574fe1ba8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ os: - linux -# - osx + - osx osx_image: xcode7.2 language: cpp sudo: required From cf2e59c98318caaccfb20b2d472635888e5e9ad0 Mon Sep 17 00:00:00 2001 From: Nikolay Kasyanov Date: Sun, 30 Oct 2016 19:32:44 +0100 Subject: [PATCH 2/2] [OS X] Use Qt 5.5 on CI Newer Qt versions require C++11. --- CI/before_install.osx.sh | 3 ++- CI/before_script.osx.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index b9da52193..8a306186e 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -1,10 +1,11 @@ #!/bin/sh brew update + brew rm cmake || true brew rm pkgconfig || true brew rm qt5 || true -brew install cmake pkgconfig qt5 +brew install cmake pkgconfig qt55 curl http://downloads.openmw.org/osx/dependencies/openmw-deps-263d4a8.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 c3822291d..32bdd41ae 100755 --- a/CI/before_script.osx.sh +++ b/CI/before_script.osx.sh @@ -4,7 +4,7 @@ export CXX=clang++ export CC=clang DEPENDENCIES_ROOT="/private/tmp/openmw-deps/openmw-deps" -QT_PATH="/usr/local/opt/qt5" +QT_PATH="/usr/local/opt/qt55" mkdir build cd build