Travis: Added OSX, use default compilers, moved cmds into own scripts

This commit is contained in:
archshift 2014-05-18 20:28:50 -07:00
parent 74f9726515
commit 99110dc460
3 changed files with 40 additions and 11 deletions

14
.travis-build.sh Normal file
View file

@ -0,0 +1,14 @@
#!/bin/sh
set -e
#if OS is linux or is not set
if [ "$TRAVIS_OS_NAME" = linux -o -z "$TRAVIS_OS_NAME" ]; then
mkdir build && cd build
cmake ..
make -j4
elif [ "$TRAVIS_OS_NAME" = osx ]; then
mkdir build && cd build
cmake .. -GXcode
xcodebuild
fi

18
.travis-deps.sh Normal file
View file

@ -0,0 +1,18 @@
#!/bin/sh
set -e
#if OS is linux or is not set
if [ "$TRAVIS_OS_NAME" = linux -o -z "$TRAVIS_OS_NAME" ]; then
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
sudo apt-get -qq update
sudo apt-get -qq install g++-4.8 xorg-dev libglu1-mesa-dev libglew-dev libxcursor-dev
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
git clone https://github.com/glfw/glfw.git
mkdir glfw/build && cd glfw/build
cmake .. && make && sudo make install
cd -
elif [ "$TRAVIS_OS_NAME" = osx ]; then
brew tap homebrew/versions
brew install glew qt glfw3 pkgconfig
fi

View file

@ -1,14 +1,11 @@
os:
- linux
- osx
language: cpp
compiler:
- gcc
before_install:
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo apt-get -qq update
- sudo apt-get -qq install g++-4.8 xorg-dev libglu1-mesa-dev libglew-dev libxcursor-dev
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
- git clone https://github.com/glfw/glfw.git
- "mkdir glfw/build && cd glfw/build && cmake .. && make && sudo make install ; cd -"
- sh .travis-deps.sh
script:
- mkdir build && cd build
- cmake ..
- make -j4
- sh .travis-build.sh