diff options
author | Jose Fonseca <jfonseca@vmware.com> | 2017-01-12 18:42:02 +0000 |
---|---|---|
committer | Jose Fonseca <jfonseca@vmware.com> | 2017-01-12 18:42:02 +0000 |
commit | 023743c13239c51be8ac9a075970fb09a9d74409 (patch) | |
tree | 5bb84461b94a146950f06a07ca0ccfd2b063b603 /.travis.yml | |
parent | fe61fd02fa9ea1457a7ced3f16b4a24af90b8b86 (diff) |
travis: Build with XCode 8.2
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index f975171a..3ea7e304 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ branches: - /^appveyor.*$/ sudo: required -dist: trusty language: generic @@ -14,23 +13,27 @@ env: matrix: include: - os: linux + dist: trusty env: - LABEL="ubuntu64" - APT_REPOS="ppa:ubuntu-toolchain-r/test" - APT_PACKAGES="gcc-4.9 g++-4.9 libdwarf-dev libprocps3-dev qtbase5-dev qtdeclarative5-dev" - CMAKE_OPTIONS="-DCMAKE_C_COMPILER=gcc-4.9 -DCMAKE_CXX_COMPILER=g++-4.9 -DENABLE_GUI=1" - os: linux + dist: trusty env: - LABEL="ubuntu32" - APT_REPOS="ppa:ubuntu-toolchain-r/test" - APT_PACKAGES="gcc-4.9-multilib g++-4.9-multilib" - CMAKE_OPTIONS="-DCMAKE_C_COMPILER=gcc-4.9 -DCMAKE_CXX_COMPILER=g++-4.9 -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_SYSTEM_LIBRARY_PATH=/usr/lib32 -DENABLE_GUI=0" - os: linux + dist: trusty env: - LABEL="ubuntu64-clang" - APT_PACKAGES="clang-3.6 libc++-dev libc++abi-dev libdwarf-dev libprocps3-dev qtbase5-dev qtdeclarative5-dev" - CMAKE_OPTIONS="-DCMAKE_C_COMPILER=clang-3.6 -DCMAKE_CXX_COMPILER=clang++-3.6 -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DENABLE_GUI=1" - os: linux + dist: trusty env: - LABEL="mingw32" - APT_REPOS="ppa:tobydox/mingw-x-trusty" @@ -39,6 +42,7 @@ matrix: - MINGW_PREFIX=i686-w64-mingw32 - CMAKE_OPTIONS="-DCMAKE_TOOLCHAIN_FILE=Toolchain.cmake -Cdxsdk-master/Cache-mingw32.cmake -DENABLE_GUI=0" - os: osx + osx_image: xcode8.2 env: - LABEL="mac64" - CMAKE_OPTIONS="-DENABLE_GUI=1" |