diff --git a/.travis.yml b/.travis.yml index 07f05b95..803f316c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,10 @@ language: cpp +os: + - linux + - osx 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/doc/usermanual/Usermanual.pdf b/doc/usermanual/Usermanual.pdf index 3d279df3..3d2d562d 100644 Binary files a/doc/usermanual/Usermanual.pdf and b/doc/usermanual/Usermanual.pdf differ 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