diff --git a/.github/workflows/continuous-building.yml b/.github/workflows/continuous-building.yml index 26271c9a..19486da7 100644 --- a/.github/workflows/continuous-building.yml +++ b/.github/workflows/continuous-building.yml @@ -14,7 +14,7 @@ jobs: os: - ubuntu-22.04 - ubuntu-24.04 - - macos-13 + - macos-14 - windows-2022 use-asan: - YES diff --git a/build-osx.sh b/build-osx.sh index addfb72b..de923582 100755 --- a/build-osx.sh +++ b/build-osx.sh @@ -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