diff --git a/.travis.yml b/.travis.yml
index 90cf770b..91f7c1e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,183 +5,112 @@ branches:
     - master
     - stable
 
-matrix:
+jobs:
   include:
-    - os: osx
+    - name: "Xcode 7.3 C++98 pure release"
+      os: osx
       osx_image: xcode7.3
-      script:
-        - mkdir ./build_pure_98_release
-        - cd ./build_pure_98_release
-        - 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 --verbose
-        - cd $TRAVIS_BUILD_DIR
-        - mkdir ./build_test_cmake
-        - cd ./build_test_cmake
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build .
       env:
-        - MATRIX_EVAL="INFO=C++98-pure-release"
+        - MATRIX_EVAL=""
+        - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_FORCE_PURE=ON"
 
-    - os: osx
+    - name: "Xcode 7.3 C++98 sse2 release"
+      os: osx
       osx_image: xcode7.3
-      script:
-        - mkdir ./build_pure_ms_release
-        - cd ./build_pure_ms_release
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON ..
-        - cmake --build .
-        - ctest --verbose
-        - cd $TRAVIS_BUILD_DIR
-        - mkdir ./build_test_cmake
-        - cd ./build_test_cmake
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build .
       env:
-        - MATRIX_EVAL="INFO=C++98-pure-ms-release"
+        - MATRIX_EVAL=""
+        - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE2=ON"
 
-    - os: osx
+    - name: "Xcode 7.3 C++98 ms release"
+      os: osx
       osx_image: xcode7.3
-      script:
-        - mkdir ./build_pure_11_release
-        - cd ./build_pure_11_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 --build .
-        - ctest --verbose
-        - cd $TRAVIS_BUILD_DIR
-        - mkdir ./build_test_cmake
-        - cd ./build_test_cmake
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build .
       env:
-        - MATRIX_EVAL="INFO=C++11-pure-release"
+        - MATRIX_EVAL=""
+        - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON"
 
-    - os: osx
+    - name: "XCode 7.3 C++11 pure release"
+      os: osx
       osx_image: xcode7.3
-      script:
-        - mkdir ./build_sse2_11_release
-        - cd ./build_sse2_11_release
-        - 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 --build .
-        - ctest --verbose
-        - cd $TRAVIS_BUILD_DIR
-        - mkdir ./build_test_cmake
-        - cd ./build_test_cmake
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build .
       env:
-        - MATRIX_EVAL="INFO=C++11-sse2-release"
+        - MATRIX_EVAL=""
+        - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_FORCE_PURE=ON"
 
-    - os: osx
+    - name: "XCode 7.3 C++11 sse2 release"
+      os: osx
+      osx_image: xcode7.3
+      env:
+        - MATRIX_EVAL=""
+        - CMAKE_BUILD_ENV="-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"
+
+    - name: "XCode 10.3 C++11 sse2 release"
+      os: osx
       osx_image: xcode10.3
-      script:
-        - mkdir ./build_pure_14_release
-        - cd ./build_pure_14_release
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_FORCE_PURE=ON ..
-        - cmake --build . --parallel 4
-        - ctest  --parallel 4 --output-on-failure
-        - cd $TRAVIS_BUILD_DIR
-        - mkdir ./build_test_cmake
-        - cd ./build_test_cmake
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --parallel 4 --build .
       env:
-        - MATRIX_EVAL="INFO=C++14-pure-release"
+        - MATRIX_EVAL=""
+        - CMAKE_BUILD_ENV="-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"
 
-    - os: osx
-      osx_image: xcode10.3
-      script:
-        - mkdir ./build_sse3_14_release
-        - cd ./build_sse3_14_release
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE3=ON ..
-        - cmake --build . --parallel 4
-        - ctest --parallel 4 --output-on-failure
-        - cd $TRAVIS_BUILD_DIR
-        - mkdir ./build_test_cmake
-        - cd ./build_test_cmake
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build . --parallel 4
-      env:
-        - MATRIX_EVAL="INFO=C++14-sse3-release"
-
-    - os: osx
-      osx_image: xcode10.3
-      script:
-        - mkdir ./build_avx_14_debug
-        - cd ./build_avx_14_debug
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_14=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON ..
-        - cmake --build . --parallel 4
-        - ctest --parallel 4 --output-on-failure
-        - cd $TRAVIS_BUILD_DIR
-        - mkdir ./build_test_cmake
-        - cd ./build_test_cmake
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build . --parallel 4
-      env:
-        - MATRIX_EVAL="INFO=C++14-avx-debug"
-
-    - os: osx
+    - name: "XCode 12.2 C++11 sse2 release"
+      os: osx
       osx_image: xcode12.2
-      script:
-        - mkdir ./build_pure_17_release
-        - cd ./build_pure_17_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 --build . --parallel 4
-        - ctest --parallel 4 --output-on-failure
-        - cd $TRAVIS_BUILD_DIR
-        - mkdir ./build_test_cmake
-        - cd ./build_test_cmake
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build . --parallel 4
       env:
-        - MATRIX_EVAL="INFO=C++17-pure-release"
+        - MATRIX_EVAL=""
+        - CMAKE_BUILD_ENV="-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"
 
-    - os: osx
+    - name: "XCode 12.2 C++11 sse2 debug"
+      os: osx
       osx_image: xcode12.2
-      script:
-        - mkdir ./build_pure_17_debug
-        - cd ./build_pure_17_debug
-        - 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 --build . --parallel 4
-        - ctest --parallel 4 --output-on-failure
-        - cd $TRAVIS_BUILD_DIR
-        - mkdir ./build_test_cmake
-        - cd ./build_test_cmake
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build . --parallel 4
       env:
-        - MATRIX_EVAL="INFO=C++17-pure-debug"
+        - MATRIX_EVAL=""
+        - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE2=ON"
 
-    - os: osx
+    - name: "XCode 12.2 C++11 avx debug"
+      os: osx
       osx_image: xcode12.2
-      script:
-        - mkdir ./build_avx_17_debug
-        - cd ./build_avx_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_AVX=ON ..
-        - cmake --build . --parallel 4
-        - ctest --parallel 4 --output-on-failure
-        - cd $TRAVIS_BUILD_DIR
-        - mkdir ./build_test_cmake
-        - cd ./build_test_cmake
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build . --parallel 4
       env:
-        - MATRIX_EVAL="INFO=C++17-avx-debug"
+        - MATRIX_EVAL=""
+        - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON"
 
-    - os: osx
+    - name: "XCode 12.2 C++14 avx debug"
+      os: osx
       osx_image: xcode12.2
-      script:
-        - 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 --build . --parallel 4
-        - ctest --parallel 4 --output-on-failure
-        - cd $TRAVIS_BUILD_DIR
-        - mkdir ./build_test_cmake
-        - cd ./build_test_cmake
-        - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
-        - cmake --build . --parallel 4
       env:
-        - MATRIX_EVAL="INFO=C++17-avx2-debug"
+        - MATRIX_EVAL=""
+        - 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_AVX=ON"
+
+    - name: "XCode 12.2 C++14 pure debug"
+      os: osx
+      osx_image: xcode12.2
+      env:
+        - MATRIX_EVAL=""
+        - 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_FORCE_PURE=ON"
+
+    - name: "XCode 12.2 C++17 pure debug"
+      os: osx
+      osx_image: xcode12.2
+      env:
+        - MATRIX_EVAL=""
+        - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_FORCE_PURE=ON"
+
+    - name: "XCode 12.2 C++17 sse2 debug"
+      os: osx
+      osx_image: xcode12.2
+      env:
+        - MATRIX_EVAL=""
+        - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE2=ON"
+
+    - name: "XCode 12.2 C++17 sse2 release"
+      os: osx
+      osx_image: xcode12.2
+      env:
+        - MATRIX_EVAL=""
+        - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE2=ON"
+
+    - name: "XCode 12.2 C++17 avx release"
+      os: osx
+      osx_image: xcode12.2
+      env:
+        - MATRIX_EVAL=""
+        - CMAKE_BUILD_ENV="-DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_17=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON"
 
     - os: linux
       dist: Xenial
@@ -414,14 +343,14 @@ matrix:
       env:
         - MATRIX_EVAL="CC=gcc-10 && CXX=g++-10 && INFO=C++17-pure-debug-ms"
       script:
-        - mkdir ./build_pure_17_debug_ms
-        - cd ./build_pure_17_debug_ms
+        - mkdir ./build
+        - cd ./build
         - 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_FORCE_PURE=ON ..
         - cmake -E time cmake --build . --parallel
         - ctest --parallel 4 --output-on-failure
         - cd $TRAVIS_BUILD_DIR
-        - mkdir ./build_test_cmake
-        - cd ./build_test_cmake
+        - mkdir ./test
+        - cd ./test
         - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
         - cmake --build . --parallel
 
@@ -436,14 +365,14 @@ matrix:
       env:
         - MATRIX_EVAL="CC=gcc-10 && CXX=g++-10 && INFO=C++17-avx-debug-ms"
       script:
-        - mkdir ./build_pure_17_debug_ms
-        - cd ./build_pure_17_debug_ms
+        - mkdir ./build
+        - cd ./build
         - 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_AVX=ON ..
         - cmake -E time cmake --build . --parallel
         - ctest --parallel 4 --output-on-failure
         - cd $TRAVIS_BUILD_DIR
-        - mkdir ./build_test_cmake
-        - cd ./build_test_cmake
+        - mkdir ./test
+        - cd ./test
         - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
         - cmake --build . --parallel
 
@@ -502,14 +431,14 @@ matrix:
       env:
         - MATRIX_EVAL="CC=clang-9 && CXX=clang++-9 && INFO=C++17-pure-debug"
       script:
-        - mkdir ./build_pure_17_debug
-        - cd ./build_pure_17_debug
+        - mkdir ./build
+        - cd ./build
         - 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 . --parallel
         - ctest --parallel 4 --output-on-failure
         - cd $TRAVIS_BUILD_DIR
-        - mkdir ./build_test_cmake
-        - cd ./build_test_cmake
+        - mkdir ./test
+        - cd ./test
         - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
         - cmake --build . --parallel
 
@@ -548,8 +477,8 @@ matrix:
         - cmake -E time cmake --build . --parallel
         - ctest --parallel 4 --output-on-failure
         - cd $TRAVIS_BUILD_DIR
-        - mkdir ./build_test_cmake
-        - cd ./build_test_cmake
+        - mkdir ./test_cmake
+        - cd ./test_cmake
         - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
         - cmake --build . --parallel
 
@@ -557,4 +486,16 @@ before_script:
     - cmake --version
     - eval "${MATRIX_EVAL}"
 
+script:
+  - mkdir ./build
+  - cd ./build
+  - cmake -DCMAKE_CXX_COMPILER=$COMPILER ${CMAKE_BUILD_ENV} ..
+  - cmake --build .
+  - ctest --verbose
+  - cd $TRAVIS_BUILD_DIR
+  - mkdir ./build_test_cmake
+  - cd ./build_test_cmake
+  - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
+  - cmake --build .
+