Skip to content

Commit e0ec200

Browse files
committed
macos-15
1 parent cef691e commit e0ec200

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ jobs:
2828
strategy:
2929
fail-fast: False
3030
matrix:
31-
os: [ubuntu-latest, windows-latest, macos-15-intel, macos-15]
31+
#os: [ubuntu-latest, windows-latest, macos-15-intel, macos-15]
3232
#os: [macos-15-intel, macos-15]
33+
os: [macos-15]
3334
env:
3435
BUILD_TYPE: Release
3536
# SANITIZE: true # uncomment to sanitize

conan-profiles/conan-profile-macOS-ARM64

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ include(conan-profile-common)
33
[settings]
44
os=Macos
55
# 14.2 is required by opensubdiv for metal
6-
os.version=14.2
6+
os.version=15.6
77
arch=armv8
88
compiler=apple-clang
9-
compiler.version=15
9+
compiler.version=17
1010
compiler.cppstd={{ os.getenv("CXX_VERSION") }}
1111
compiler.libcxx=libc++
1212

@@ -16,10 +16,11 @@ boost/*:without_locale=True
1616
minizip-ng/*:with_zlib=True
1717
minizip-ng/*:with_libcomp=False
1818
embree/*:shared=True
19+
openvdb/*:tools.cmake.cmaketoolchain:user_toolchain+={{profile_dir}}/macos_var.cmake
1920

2021
[buildenv]
21-
CXX=clang++
22-
CC=clang
22+
VERBOSE=1
2323

2424
[conf]
25-
&:tools.build:cxxflags=["-O3"]
25+
&:tools.build:cxxflags+=["-O3", "-w", "-Wno-error"]
26+
tools.build:cxxflags+=["-w", "-Wno-error"]

conan-profiles/macos_var.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# This file injects OPENVDB variable
2+
set(OPENVDB_CXX_STRICT OFF CACHE BOOL "")

0 commit comments

Comments
 (0)