From 3b7990b56954643b99e78019087f3010a1f6e1ea Mon Sep 17 00:00:00 2001 From: Zach H Date: Fri, 7 Apr 2017 08:41:33 -0400 Subject: [PATCH] fix travis build (#2575) * fix travis build * rename dir --- travis-compile.sh | 4 ++-- travis-dependencies.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/travis-compile.sh b/travis-compile.sh index f0d72ff8..8deb6660 100755 --- a/travis-compile.sh +++ b/travis-compile.sh @@ -4,11 +4,11 @@ set -e ./servatrice/check_schema_version.sh -mkdir build +mkdir -p build cd build prefix="" if [[ $TRAVIS_OS_NAME == "osx" ]]; then - prefix="-DCMAKE_PREFIX_PATH=$(echo /usr/local/Cellar/qt5/5.*/)" + prefix="-DCMAKE_PREFIX_PATH=$(echo /usr/local/Cellar/qt/5.*/)" fi if [[ $TRAVIS_OS_NAME == "linux" ]]; then prefix="-DCMAKE_PREFIX_PATH=$(echo /opt/qt5*/lib/cmake/)" diff --git a/travis-dependencies.sh b/travis-dependencies.sh index 13bdc727..9c1093df 100755 --- a/travis-dependencies.sh +++ b/travis-dependencies.sh @@ -2,7 +2,8 @@ if [[ $TRAVIS_OS_NAME == "osx" ]] ; then brew update > /dev/null - brew install qt5 protobuf > /dev/null + brew install --force qt + brew install protobuf else # common prerequisites sudo add-apt-repository -y ppa:smspillaz/cmake-master