Fixed travis build on osx

This commit is contained in:
ctrlaltca 2016-10-05 14:24:50 +02:00 committed by GitHub
parent a7a0ea23ca
commit d8f7c57eff

View file

@ -3,8 +3,6 @@
if [[ $TRAVIS_OS_NAME == "osx" ]] ; then if [[ $TRAVIS_OS_NAME == "osx" ]] ; then
brew update > /dev/null brew update > /dev/null
brew install qt5 protobuf > /dev/null brew install qt5 protobuf > /dev/null
brew unlink cmake
brew upgrade cmake
else else
# common prerequisites # common prerequisites
sudo add-apt-repository -y ppa:smspillaz/cmake-master sudo add-apt-repository -y ppa:smspillaz/cmake-master
@ -29,4 +27,4 @@ else
sudo ln -s /usr/src/gtest/build/libgtest_main.so /usr/lib/libgtest_main.so sudo ln -s /usr/src/gtest/build/libgtest_main.so /usr/lib/libgtest_main.so
cd - cd -
fi fi
fi fi