Reordered target for consistency

This commit is contained in:
Christophe Riccio 2018-08-19 15:07:13 +02:00
parent 6b2220459d
commit 096eb6726a

View File

@ -3,52 +3,28 @@ language: cpp
matrix: matrix:
include: include:
- os: osx - os: osx
osx_image: xcode10 osx_image: xcode6.4
script: script:
- cmake --version - cmake --version
- mkdir ./build_pure_17_release - mkdir ./build_pure_11_release
- cd ./build_pure_17_release - cd ./build_pure_11_release
- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_FORCE_PURE=ON .. - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_FORCE_PURE=ON ..
- cmake -E time cmake --build . - cmake -E time cmake --build .
- ctest - ctest
env: env:
- MATRIX_EVAL="INFO=C++17-pure-release" - MATRIX_EVAL="INFO=C++11-pure-release"
- os: osx - os: osx
osx_image: xcode10 osx_image: xcode6.4
script: script:
- cmake --version - cmake --version
- mkdir ./build_pure_17_debug - mkdir ./build_sse2_11_release
- cd ./build_pure_17_debug - cd ./build_sse2_11_release
- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_FORCE_PURE=ON .. - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE2=ON ..
- cmake -E time cmake --build . - cmake -E time cmake --build .
- ctest - ctest
env: env:
- MATRIX_EVAL="INFO=C++17-pure-debug" - MATRIX_EVAL="INFO=C++11-sse2-release"
- os: osx
osx_image: xcode10
script:
- cmake --version
- mkdir ./build_avx2_17_release
- cd ./build_avx2_17_release
- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX2=ON ..
- cmake -E time cmake --build .
- ctest
env:
- MATRIX_EVAL="INFO=C++17-avx2-release"
- os: osx
osx_image: xcode10
script:
- cmake --version
- mkdir ./build_avx2_17_debug
- cd ./build_avx2_17_debug
- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX2=ON ..
- cmake -E time cmake --build .
- ctest
env:
- MATRIX_EVAL="INFO=C++17-avx2-debug"
- os: osx - os: osx
osx_image: xcode8 osx_image: xcode8
@ -99,28 +75,52 @@ matrix:
- MATRIX_EVAL="INFO=C++14-avx-debug" - MATRIX_EVAL="INFO=C++14-avx-debug"
- os: osx - os: osx
osx_image: xcode6.4 osx_image: xcode10
script: script:
- cmake --version - cmake --version
- mkdir ./build_pure_11_release - mkdir ./build_pure_17_release
- cd ./build_pure_11_release - cd ./build_pure_17_release
- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_FORCE_PURE=ON .. - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_FORCE_PURE=ON ..
- cmake -E time cmake --build . - cmake -E time cmake --build .
- ctest - ctest
env: env:
- MATRIX_EVAL="INFO=C++11-pure-release" - MATRIX_EVAL="INFO=C++17-pure-release"
- os: osx - os: osx
osx_image: xcode6.4 osx_image: xcode10
script: script:
- cmake --version - cmake --version
- mkdir ./build_sse2_11_release - mkdir ./build_pure_17_debug
- cd ./build_sse2_11_release - cd ./build_pure_17_debug
- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE2=ON .. - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_FORCE_PURE=ON ..
- cmake -E time cmake --build . - cmake -E time cmake --build .
- ctest - ctest
env: env:
- MATRIX_EVAL="INFO=C++11-sse2-release" - MATRIX_EVAL="INFO=C++17-pure-debug"
- os: osx
osx_image: xcode10
script:
- cmake --version
- mkdir ./build_avx2_17_release
- cd ./build_avx2_17_release
- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX2=ON ..
- cmake -E time cmake --build .
- ctest
env:
- MATRIX_EVAL="INFO=C++17-avx2-release"
- os: osx
osx_image: xcode10
script:
- cmake --version
- mkdir ./build_avx2_17_debug
- cd ./build_avx2_17_debug
- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX2=ON ..
- cmake -E time cmake --build .
- ctest
env:
- MATRIX_EVAL="INFO=C++17-avx2-debug"
- os: linux - os: linux
addons: addons: