olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ci: update to macos-14 

this should give us xcode 16, with better c++20 support (e.g. 3-way comparison on std::optional)
This commit is contained in:
Eric Wasylishen 2025-01-01 19:15:50 -07:00
parent 4c1d4af2ed
commit a6c7a18cb8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/continuous-building.yml vendored
View File

@ -14,7 +14,7 @@ jobs:
os:
- ubuntu-22.04
- ubuntu-24.04
- macos-13
- macos-14
- windows-2022
use-asan:
- YES

4
build-osx.sh
View File

@ -34,9 +34,9 @@ TBB_CMAKE_DIR="$(pwd)/${TBB_DIR_NAME}/lib/cmake"
# check USE_ASAN environment variable (see cmake.yml)
if [ "$USE_ASAN" == "YES" ]; then
cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" -DENABLE_LIGHTPREVIEW=YES -DERICWTOOLS_ASAN=YES
cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" -DCMAKE_OSX_ARCHITECTURES=x86_64 -DENABLE_LIGHTPREVIEW=YES -DERICWTOOLS_ASAN=YES
else
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR"
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" -DCMAKE_OSX_ARCHITECTURES=x86_64
fi
make -j8 package || exit 1