From bda01b2044e454978ba158defb632ee9a47afd5c Mon Sep 17 00:00:00 2001 From: Gavin Bisesi Date: Wed, 25 Jun 2014 11:48:48 -0400 Subject: [PATCH] Install dependencies for travis more generally --- .travis.yml | 4 +--- travis-dependencies.sh | 9 +++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100755 travis-dependencies.sh diff --git a/.travis.yml b/.travis.yml index 2d1f870e..803f316c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,5 @@ compiler: - gcc - clang script: mkdir build && cd build && cmake .. && make -before_install: - - sudo apt-get update -qq - - sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev build-essential +install: ./travis-dependencies.sh cache: apt diff --git a/travis-dependencies.sh b/travis-dependencies.sh new file mode 100755 index 00000000..533a213b --- /dev/null +++ b/travis-dependencies.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +if [[ $TRAVIS_OS_NAME == "osx" ]] ; then + brew update + brew install qt cmake protobuf +else + sudo apt-get update -qq + sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev +fi