mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-26 10:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1072 from g-truc/travis-update

Browse Source 
Use default clang version of distribution
This commit is contained in:
Christophe 2021-05-15 12:51:02 +02:00 committed by GitHub
commit 70f67cb457
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.travis.yml
View File

@ -295,50 +295,29 @@ jobs:
- CTEST_ENV="--parallel 4 --output-on-failure" - CTEST_ENV="--parallel 4 --output-on-failure"
- CMAKE_ENV="--parallel" - CMAKE_ENV="--parallel"
- name: "Clang 3.6 C++14 pure release" - name: "Clang C++14 pure release"
os: linux os: linux
dist: Xenial dist: Xenial
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.6
packages:
- clang-3.6
env: env:
- MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6" - MATRIX_EVAL="CC=clang && CXX=clang++"
- CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_FORCE_PURE=ON" - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_FORCE_PURE=ON"
- CTEST_ENV="--parallel 4 --output-on-failure" - CTEST_ENV="--parallel 4 --output-on-failure"
- CMAKE_ENV="--parallel" - CMAKE_ENV="--parallel"
- name: "Clang 3.6 C++14 pure debug" - name: "Clang C++14 pure debug"
os: linux os: linux
dist: Xenial dist: Xenial
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.6
packages:
- clang-3.6
env: env:
- MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6" - MATRIX_EVAL="CC=clang && CXX=clang++"
- CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_FORCE_PURE=ON" - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_FORCE_PURE=ON"
- CTEST_ENV="--parallel 4 --output-on-failure" - CTEST_ENV="--parallel 4 --output-on-failure"
- CMAKE_ENV="--parallel" - CMAKE_ENV="--parallel"
- name: "Clang 3.6 C++14 sse2 debug" - name: "Clang C++14 sse2 debug"
os: linux os: linux
dist: Xenial dist: Xenial
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.6
packages:
- clang-3.6
env: env:
- MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6" - MATRIX_EVAL="CC=clang && CXX=clang++"
- CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE2=ON" - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE2=ON"
- CTEST_ENV="--parallel 4 --output-on-failure" - CTEST_ENV="--parallel 4 --output-on-failure"
- CMAKE_ENV="--parallel" - CMAKE_ENV="--parallel"
@ -393,6 +372,7 @@ before_script:
- eval "${MATRIX_EVAL}" - eval "${MATRIX_EVAL}"
script: script:
- ${CC} --version
- mkdir ./build - mkdir ./build
- cd ./build - cd ./build
- cmake -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/install -DCMAKE_CXX_COMPILER=$COMPILER ${CMAKE_BUILD_ENV} .. - cmake -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/install -DCMAKE_CXX_COMPILER=$COMPILER ${CMAKE_BUILD_ENV} ..