From e51be9c01ef6d63b27f6cb726cb96e6a3e8ed2ea Mon Sep 17 00:00:00 2001
From: Christophe Riccio <christophe.riccio@unity3d.com>
Date: Sat, 19 Nov 2016 20:47:20 +0100
Subject: [PATCH] Updated travis build

---
 .travis.yml | 58 +++++++++++++++++++++++++++++++++++++++--------------
 readme.md   |  6 +-----
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1916aca0..3e05677a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,41 @@
 language: cpp
 
-os:
-  - linux
-  - osx
+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++-6.1
+      env: COMPILER=g++-6.1
+    - compiler: clang
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.4
+          packages:
+            - clang-3.4
+      env: COMPILER=clang++-3.4
+    - compiler: clang
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.9
+          packages:
+            - clang-3.9
+      env: COMPILER=clang++-3.9
 
 compiler:
   - clang
@@ -10,21 +43,15 @@ compiler:
 before_script: 
 
 script:
-- mkdir ./build_98_pure
-- cd ./build_98_pure
-- cmake -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_FORCE_PURE=ON ..
+- mkdir ./build_pure
+- cd ./build_pure
+- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_FORCE_PURE=ON ..
 - cmake --build .
 - ctest
 - cd ..
-- mkdir ./build_98_simd
-- cd ./build_98_simd
-- cmake -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON ..
-- cmake --build .
-- ctest
-- cd ..
-- mkdir ./build_11_simd
-- cd ./build_11_simd
-- cmake -DGLM_TEST_ENABLE=ON ..
+- mkdir ./build_simd
+- cd ./build_simd
+- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON ..
 - cmake --build .
 - ctest
 - cd ..
@@ -33,3 +60,4 @@ script:
 
 
 
+
diff --git a/readme.md b/readme.md
index 39e43a65..75712ff9 100644
--- a/readme.md
+++ b/readme.md
@@ -47,11 +47,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 | Service | System | Compiler | Status |
 | ------- | ------ | -------- | ------ |
 | [Drone](https://drone.io/github.com/g-truc/glm) | Linux 64 bits | GCC 4.6.3 | [![Build Status](https://drone.io/github.com/g-truc/glm/status.png)](https://drone.io/github.com/g-truc/glm/latest) |
-| ------- | ------ | -------- | ------ |
-| [Travis CI]| macOS, Linux 64 bits | Clang, GCC 4.6.3 | [![Travis CI](https://travis-ci.org/g-truc/glm.svg?branch=master)](https://travis-ci.org/g-truc/glm)
-
-
-
+| [Travis CI](https://travis-ci.org/g-truc/glm)| Linux 64 bits | Clang 3.4, Clang 3.9, GCC 4.9, GCC 6.1   | [![Travis CI](https://travis-ci.org/g-truc/glm.svg?branch=master)](https://travis-ci.org/g-truc/glm)
 
 ## Release notes