fix travis build (#2575)

* fix travis build

* rename dir
This commit is contained in:
Zach H 2017-04-07 08:41:33 -04:00 committed by ctrlaltca
parent 657e1ac9e6
commit 3b7990b569
2 changed files with 4 additions and 3 deletions

View file

@ -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/)"

View file

@ -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