Skip to content
GitLab
Commit fd5c497e authored by Waleed Khan's avatar Waleed Khan
Browse files

Merge branch 'travis-osx-no-cmake' into deck-parser-ampersand

parents b1bfda9f 4df46b13
Hide whitespace changes
Inline Side-by-side
travis-dependencies.sh
View file @ fd5c497e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
if [[ $TRAVIS_OS_NAME == "osx" ]] ; then if [[ $TRAVIS_OS_NAME == "osx" ]] ; then
brew update brew update
brew install qt cmake protobuf libgcrypt brew install qt protobuf libgcrypt
else else
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment