From 0a8fe23eea4872bbe01eb3df4ad518de34c9a304 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Tue, 26 Jul 2016 13:12:07 -0400 Subject: [PATCH] Another attempt at travis C++11 --- .travis.yml | 52 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 999148c..ab6466e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,18 +12,7 @@ compiler: os: - linux - -# Install packages differs for container-based infrastructure -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - cmake - - # https://github.com/travis-ci-tester/travis-test-gcc-cxx-11 - - g++-4.9 - + before_install: - sudo apt-get update - sudo apt-get install build-essential @@ -43,9 +32,46 @@ before_script: - sudo make -j4 install - cd ../.. +matrix: + include: + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.9 + env: COMPILER=g++-4.9 + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-5 + env: COMPILER=g++-5 + - compiler: clang + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.6 + packages: + - clang-3.6 + env: COMPILER=clang++-3.6 + - compiler: clang + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.7 + packages: + - clang-3.7 + env: COMPILER=clang++-3.7 + script: - mkdir build - cd build - - cmake -D CMAKE_BUILD_TYPE=RELEASE .. + - cmake -D CMAKE_BUILD_TYPE=RELEASE .. - make - ./bin/FaceLandmarkImg -fdir "../videos/" -ofdir "./demo_img/" -oidir "./demo_img/" -wild -q \ No newline at end of file