travis: Build on OS X

This commit is contained in:
MerryMage 2016-09-02 12:57:16 +01:00
parent b3743e9453
commit ba04be5071
4 changed files with 33 additions and 11 deletions

View file

@ -5,6 +5,9 @@ matrix:
- os: linux
sudo: required
dist: trusty
- os: osx
sudo: false
osx_image: xcode7.3
addons:
apt:

View file

@ -3,6 +3,9 @@
set -e
set -x
cmake --version
if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
export CC=gcc-6
export CXX=g++-6
export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH
@ -12,3 +15,12 @@ cmake .. -DDYNARMIC_USE_SYSTEM_BOOST=0 -DBoost_INCLUDE_DIRS=externals/ext-boost
make -j4
ctest -VV -C Release
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
set -o pipefail
export MACOSX_DEPLOYMENT_TARGET=10.9
mkdir build && cd build
cmake .. -GXcode -DDYNARMIC_USE_SYSTEM_BOOST=0 -DBoost_INCLUDE_DIRS=externals/ext-boost -DDYNARMIC_TESTS=0
xcodebuild -configuration Release
fi

View file

@ -3,11 +3,17 @@
set -e
set -x
mkdir -p $HOME/.local
curl -L https://cmake.org/files/v3.4/cmake-3.4.1-Linux-i386.tar.gz \
| tar -xz -C $HOME/.local --strip-components=1
# TODO: This isn't ideal.
cd externals
git clone https://github.com/citra-emu/ext-boost
cd ..
if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
mkdir -p $HOME/.local
curl -L https://cmake.org/files/v3.4/cmake-3.4.1-Linux-i386.tar.gz \
| tar -xz -C $HOME/.local --strip-components=1
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
brew update > /dev/null # silence the very verbose output
brew unlink cmake || true
brew install cmake
fi

View file

@ -6,6 +6,7 @@
#pragma once
#include <functional>
#include <string>
#include <tuple>
#include <utility>