summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2017-01-25 09:40:19 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2017-01-25 09:40:19 +0100
commit0473fca03c1c61cb66497f4fe9be9d9bc79d72ee (patch)
tree960eddf80051e2ae99ac96edbf4ade412acb26a5 /.travis.yml
parent510bcffb81d4607d2c7d9a0fa1f46ed72ae3cde4 (diff)
downloadATCD-0473fca03c1c61cb66497f4fe9be9d9bc79d72ee.tar.gz
Rework clang support
* .travis.yml:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml28
1 files changed, 27 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index f5184579152..c5c386888c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ os:
compiler:
- gcc
- - clang
env:
matrix:
@@ -25,12 +24,39 @@ env:
- TAO_ROOT=$TRAVIS_BUILD_DIR/TAO
- MPC_ROOT=$TRAVIS_BUILD_DIR/MPC
- LD_LIBRARY_PATH=$ACE_ROOT/lib:$LD_LIBRARY_PATH
+ - COMPILER=g++-5
+
+matrix:
+ include:
+ - compiler: gcc
+ addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - libxerces-c-dev
+ - libssl-dev
+ - g++-5
+ - compiler: clang
+ addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ - llvm-toolchain-precise-3.7
+ packages:
+ - libxerces-c-dev
+ - libssl-dev
+ - clang++-3.7
+ env: COMPILER=clang++-3.7
addons:
apt:
+ sources:
+ - ubuntu-toolchain-r-test
packages:
- libssl-dev
- libxerces-c-dev
+ - g++-5
before_install:
- git clone --depth 1 git://github.com/DOCGroup/MPC.git