Fixes for tests build

g-truc · Dec 20, 2023 · 6e6c425 · 6e6c425
1 parent 2834400
commit 6e6c425
Show file tree

Hide file tree

Showing 9 changed files with 376 additions and 131 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,14 +2,108 @@ name: ci
 run-name: ${{ github.actor }} is testing out GitHub Actions 🚀
 on: [push]
 jobs:
- Pure:
- runs-on: ${{ matrix.os}}
+ windows-latest:
+ runs-on: windows-latest
  strategy:
  fail-fast: false
  matrix:
- std: [98, 11, 14, 17, 20]
+ std: [98, 11, 17]
  config: [Debug, Release]
- os: [ubuntu-latest, macos-latest, windows-latest]
+ #os: [ubuntu-latest, macos-latest, windows-latest]
+ vs-version: [13, 14, 15, 16, 17]
+ exclude:
+ - std: 17
+ vs-version: 13
+ - std: 17
+ vs-version: 14
+ - std: 17
+ vs-version: 15
+
+ steps:
+ - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
+ - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
+ - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
+ - name: Check out repository code
+ uses: actions/checkout@v4
+ - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
+ - run: echo "🖥️ The workflow is now ready to test your code on the runner."
+ - name: List files in the repository
+ run: |
+ ls ${{ github.workspace }}
+ - run: echo "🍏 This job's status is ${{ job.status }}."
+ - name: CMake Version
+ run: cmake --version
+ - run: cmake -S. -B ./build_pure -DGLM_TEST_FORCE_PURE=ON
+ - run: cmake -S. -B ./build_pure_ext -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+ - run: cmake -S. -B ./build_sse2 -DGLM_TEST_ENABLE_SIMD_SSE2=ON
+ - run: cmake -S. -B ./build_sse2_ext -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+ - run: cmake -S. -B ./build_avx2 -DGLM_TEST_ENABLE_SIMD_AVX=ON
+ - run: cmake -S. -B ./build_avx2_ext -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+ - run: cmake --build ./build_pure --config ${{matrix.config}}
+ - run: cmake --build ./build_pure_ext --config ${{matrix.config}}
+ - run: cmake --build ./build_sse2 --config ${{matrix.config}}
+ - run: cmake --build ./build_sse2_ext --config ${{matrix.config}}
+ - run: cmake --build ./build_avx2 --config ${{matrix.config}}
+ - run: cmake --build ./build_avx2_ext --config ${{matrix.config}}
+ #- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure
+ #- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_ext
+ #- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2
+ #- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_sse2_ext
+ #- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_avx2
+ #- run: ctest --verbose -C ${{matrix.config}} --test-dir ./build_avx2_ext
+ ubuntu-latest:
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ std: [98, 11, 17]
+ config: [Debug, Release]
+ gcc: [4.7, 8, 12]
+ exclude:
+ - std: 17
+ gcc: 4.7
+ - std: 17
+ gcc: 8
+ steps:
+ - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
+ - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
+ - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
+ - name: Check out repository code
+ uses: actions/checkout@v4
+ - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
+ - run: echo "🖥️ The workflow is now ready to test your code on the runner."
+ - name: List files in the repository
+ run: |
+ ls ${{ github.workspace }}
+ - run: echo "🍏 This job's status is ${{ job.status }}."
+ - name: GCC Version
+ run: gcc --version
+ - name: CMake Version
+ run: cmake --version
+ - run: cmake -S. -B ./build_pure -DGLM_TEST_FORCE_PURE=ON
+ - run: cmake -S. -B ./build_pure_ext -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+ - run: cmake -S. -B ./build_sse2 -DGLM_TEST_ENABLE_SIMD_SSE2=ON
+ - run: cmake -S. -B ./build_sse2_ext -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+ - run: cmake -S. -B ./build_avx2 -DGLM_TEST_ENABLE_SIMD_AVX=ON
+ - run: cmake -S. -B ./build_avx2_ext -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+ - run: cmake --build ./build_pure --config ${{matrix.config}}
+ - run: cmake --build ./build_pure_ext --config ${{matrix.config}}
+ - run: cmake --build ./build_sse2 --config ${{matrix.config}}
+ - run: cmake --build ./build_sse2_ext --config ${{matrix.config}}
+ - run: cmake --build ./build_avx2 --config ${{matrix.config}}
+ - run: cmake --build ./build_avx2_ext --config ${{matrix.config}}
+ macos-latest:
+ runs-on: macos-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ std: [98, 11, 17]
+ config: [Debug, Release]
+ version: [3.9, 15]
+ exclude:
+ - std: 17
+ version: 3.9
+ #os: [ubuntu-latest, macos-latest, windows-latest]
  steps:
  - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
  - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
@@ -22,10 +116,20 @@ jobs:
  run: |
  ls ${{ github.workspace }}
  - run: echo "🍏 This job's status is ${{ job.status }}."
- #- run: cmake -S. -B ./build_98_pure -D GLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_FORCE_PURE=ON -DCMAKE_BUILD_TYPE=${{matrix.config}}
- - run: cmake -S. -B ./build_auto -DCMAKE_BUILD_TYPE=${{matrix.config}}
- - run: cmake --build ./build_auto --parallel --config ${{matrix.config}}
- - run: ctest --parallel 4 --verbose -C ${{matrix.config}} --test-dir ./build_auto
+ - name: CMake Version
+ run: cmake --version
+ - run: cmake -S. -B ./build_pure -DGLM_TEST_FORCE_PURE=ON
+ - run: cmake -S. -B ./build_pure_ext -DGLM_TEST_FORCE_PURE=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+ - run: cmake -S. -B ./build_sse2 -DGLM_TEST_ENABLE_SIMD_SSE2=ON
+ - run: cmake -S. -B ./build_sse2_ext -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+ - run: cmake -S. -B ./build_avx2 -DGLM_TEST_ENABLE_SIMD_AVX=ON
+ - run: cmake -S. -B ./build_avx2_ext -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
+ - run: cmake --build ./build_pure --config ${{matrix.config}}
+ - run: cmake --build ./build_pure_ext --config ${{matrix.config}}
+ - run: cmake --build ./build_sse2 --config ${{matrix.config}}
+ - run: cmake --build ./build_sse2_ext --config ${{matrix.config}}
+ - run: cmake --build ./build_avx2 --config ${{matrix.config}}
+ - run: cmake --build ./build_avx2_ext --config ${{matrix.config}}
 
 #name: GLM Unit Tests
 

diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
@@ -82,8 +82,8 @@
 
 #if (defined(GLM_FORCE_CXX_UNKNOWN))
 # define GLM_LANG 0
-#elif defined(GLM_FORCE_CXX2A)
-# define GLM_LANG (GLM_LANG_CXX2A | GLM_LANG_EXT)
+#elif defined(GLM_FORCE_CXX20)
+# define GLM_LANG (GLM_LANG_CXX20 | GLM_LANG_EXT)
 # define GLM_LANG_STL11_FORCED
 #elif defined(GLM_FORCE_CXX17)
 # define GLM_LANG (GLM_LANG_CXX17 | GLM_LANG_EXT)