From c904fc419d65ea8aa9533e733f0f62ce28e8769e Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Fri, 16 Jun 2017 15:29:41 +0200 Subject: [PATCH] use clang 3.6 --- .travis.yml | 15 ++++++++++----- .travis/template.txt | 11 +++++++---- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7f319eec64b..1521a06728c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,8 +43,15 @@ env: - PACKAGE='TDS_3 Three Triangulation ' - PACKAGE='Triangulation_2 Triangulation_3 Union_find ' - PACKAGE='Visibility_2 Voronoi_diagram_2 ' - - PACKAGE='Polyhedron_demo' + - PACKAGE='Polyhedron_demo' + + +compiler: + - clang-3.6 + - gcc install: + - if [[ "$CXX" = "clang++" ]]; then export CXX=clang++-3.6 CC=clang-3.6; fi + before_script: - mkdir -p build - cd build @@ -54,14 +61,12 @@ before_script: script: - cd ./.travis - bash -x -e ./build_package.sh $PACKAGE -compiler: - - clang - - gcc addons: apt: sources: - sourceline: 'ppa:ppsspp/cmake' - packages: + packages: + - clang-3.6 - zsh - cmake - libboost1.55-dev diff --git a/.travis/template.txt b/.travis/template.txt index 4f5fec1d660..435ffa465cf 100644 --- a/.travis/template.txt +++ b/.travis/template.txt @@ -4,7 +4,12 @@ sudo: required env: matrix: PACKAGES_MATRIX +compiler: + - clang-3.6 + - gcc install: + - if [[ "$CXX" = "clang++" ]]; then export CXX=clang++-3.6 CC=clang-3.6; fi + before_script: - mkdir -p build - cd build @@ -14,14 +19,12 @@ before_script: script: - cd ./.travis - bash -x -e ./build_package.sh $PACKAGE -compiler: - - clang - - gcc addons: apt: sources: - sourceline: 'ppa:ppsspp/cmake' - packages: + packages: + - clang-3.6 - zsh - cmake - libboost1.55-dev