From 0472c3f4d6aa4ecdceba89362d0b24aa81909c02 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 24 Nov 2016 19:39:28 +0100 Subject: [PATCH] Fixed Travis-CI crahing on OSX, doesn't support AVX it seems --- .travis.yml | 66 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29be9e41..ecd8422b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,51 +36,75 @@ script: - cmake --build . - ctest - cd .. -- mkdir ./build_simd_11 -- cd ./build_simd_11 -- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON .. -- cmake --build . -- ctest -- cd .. - mkdir ./build_pure_98 - cd ./build_pure_98 - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -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_98 -- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON .. -- cmake --build . -- ctest -- cd .. - mkdir ./build_pure_11_debug - cd ./build_pure_11_debug - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_FORCE_PURE=ON .. - cmake --build . - ctest - cd .. -- mkdir ./build_simd_11_debug -- cd ./build_simd_11_debug -- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON .. -- cmake --build . -- ctest -- cd .. - mkdir ./build_pure_98_debug - cd ./build_pure_98_debug - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_FORCE_PURE=ON .. - cmake --build . - ctest - cd .. +- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then +- mkdir ./build_simd_11 +- cd ./build_simd_11 +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_SIMD_SSE3=ON .. +- cmake --build . +- ctest +- cd .. +- mkdir ./build_simd_98 +- cd ./build_simd_98 +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_ENABLE_SIMD_SSE3=ON .. +- cmake --build . +- ctest +- cd .. +- mkdir ./build_simd_11_debug +- cd ./build_simd_11_debug +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_SIMD_SSE3=ON .. +- cmake --build . +- ctest +- cd .. +- mkdir ./build_simd_98_debug +- cd ./build_simd_98_debug +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_ENABLE_SIMD_SSE3=ON .. +- cmake --build . +- ctest +- cd .. +- else +- mkdir ./build_simd_11 +- cd ./build_simd_11 +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON .. +- cmake --build . +- ctest +- cd .. +- mkdir ./build_simd_98 +- cd ./build_simd_98 +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON .. +- cmake --build . +- ctest +- cd .. +- mkdir ./build_simd_11_debug +- cd ./build_simd_11_debug +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON .. +- cmake --build . +- ctest +- cd .. - mkdir ./build_simd_98_debug - cd ./build_simd_98_debug - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON .. - cmake --build . - ctest - cd .. - - - +- fi