organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-04 13:05:00 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Fix macOS latest

Browse source
This commit is contained in:
christophe 2025-01-22 09:54:31 +01:00
parent fe26a526cd
commit c11bff7853
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/ci.yml vendored
View file

@ -272,28 +272,28 @@ jobs:
run: |
cmake -S. -B ./build_auto -DGLM_BUILD_TESTS=ON
cmake --build ./build_auto --config ${{matrix.config}}
ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_auto
ctest --verbose -C ${{matrix.config}} --test-dir ./build_auto
- name: Run with GLM_FORCE_PURE
run: |
cmake -S. -B ./build_pure_std -DGLM_BUILD_TESTS=ON -DGLM_FORCE_PURE=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON
cmake --build ./build_pure_std --config ${{matrix.config}}
ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_pure_std
ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_std
- name: Run with GLM_FORCE_PURE and language extensions
run: |
cmake -S. -B ./build_pure_ext -DGLM_BUILD_TESTS=ON -DGLM_FORCE_PURE=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON -DGLM_ENABLE_LANG_EXTENSIONS=ON
cmake --build ./build_pure_ext --config ${{matrix.config}}
ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_pure_ext
ctest --verbose -C ${{matrix.config}} --test-dir ./build_pure_ext
- name: Run with GLM_ENABLE_SIMD_NEON
run: |
cmake -S. -B ./build_neon_std -DGLM_BUILD_TESTS=ON -DGLM_ENABLE_SIMD_NEON=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON
cmake --build ./build_neon_std --config ${{matrix.config}}
ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_neon_std
ctest --verbose -C ${{matrix.config}} --test-dir ./build_neon_std
- name: Run with GLM_ENABLE_SIMD_NEON and language extensions
run: |
cmake -S. -B ./build_neon_ext -DGLM_BUILD_TESTS=ON -DGLM_ENABLE_SIMD_NEON=ON -DGLM_ENABLE_CXX_${{matrix.std}}=ON -DGLM_ENABLE_LANG_EXTENSIONS=ON
cmake --build ./build_neon_ext --config ${{matrix.config}}
ctest --rerun-failed --output-on-failure -C ${{matrix.config}} --test-dir ./build_neon_ext
ctest --verbose -C ${{matrix.config}} --test-dir ./build_neon_ext

11
test/core/core_type_aligned.cpp
View file

@ -1,3 +1,12 @@
#include <glm/detail/setup.hpp>
#if GLM_PLATFORM & GLM_PLATFORM_APPLE // Fail on Github macOS-latest (macOS-13 was fine)
int main()
{
return 0;
}
#else
#ifndef GLM_FORCE_PURE
#define GLM_FORCE_DEFAULT_ALIGNED_GENTYPES
#endif
@ -111,3 +120,5 @@ int main()
return Error;
}
#endif//GLM_PLATFORM & GLM_PLATFORM_APPLE