Updated travis configuration

This commit is contained in:
Christophe Riccio 2016-11-19 21:00:43 +01:00
parent e51be9c01e
commit 11924962dd
2 changed files with 25 additions and 13 deletions

View File

@ -16,26 +16,26 @@ matrix:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- g++-6.1 - g++-5.4
env: COMPILER=g++-6.1 env: COMPILER=g++-5.4
- compiler: clang - compiler: clang
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.4 - llvm-toolchain-precise-3.6
packages: packages:
- clang-3.4 - clang-3.6
env: COMPILER=clang++-3.4 env: COMPILER=clang++-3.6
- compiler: clang - compiler: clang
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.9 - llvm-toolchain-precise-3.8
packages: packages:
- clang-3.9 - clang-3.8
env: COMPILER=clang++-3.9 env: COMPILER=clang++-3.8
compiler: compiler:
- clang - clang
@ -43,15 +43,27 @@ compiler:
before_script: before_script:
script: script:
- mkdir ./build_pure - mkdir ./build_pure_11
- cd ./build_pure - cd ./build_pure
- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_FORCE_PURE=ON .. - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_FORCE_PURE=ON ..
- cmake --build . - cmake --build .
- ctest - ctest
- cd .. - cd ..
- mkdir ./build_simd - mkdir ./build_simd_11
- cd ./build_simd - cd ./build_simd
- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON .. - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON ..
- cmake --build .
- ctest
- cd ..
- mkdir ./build_pure_98
- cd ./build_pure
- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_FORCE_PURE=ON ..
- cmake --build .
- ctest
- cd ..
- mkdir ./build_simd_98
- cd ./build_simd
- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON ..
- cmake --build . - cmake --build .
- ctest - ctest
- cd .. - cd ..

View File

@ -47,7 +47,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
| Service | System | Compiler | Status | | 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) | | [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](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) | [Travis CI](https://travis-ci.org/g-truc/glm)| Linux 64 bits | Clang 3.6, Clang 3.8, GCC 4.9, GCC 5.4 | [![Travis CI](https://travis-ci.org/g-truc/glm.svg?branch=master)](https://travis-ci.org/g-truc/glm)
## Release notes ## Release notes