macos-15

Author: howetuft

.github/workflows/build.yml

@@ -29,7 +29,7 @@ jobs:
       fail-fast: False
       matrix:
         os: [ubuntu-latest, windows-latest, macos-15-intel, macos-15]
-        #os: [macos-15-intel, macos-15]
+
     env:
       BUILD_TYPE: Release
       # SANITIZE: true # uncomment to sanitize
@@ -163,22 +163,6 @@ jobs:
         if: runner.os == 'Windows'
         run: git config --system core.longpaths true
 
-      - name: Set MacOS deployment target (MacOS)
-        if: runner.os == 'macOS'
-        uses: actions/github-script@v7
-        with:
-          script: |
-            if ('${{ runner.arch }}' == 'X64') {
-              target = '10.15';
-              arch='x86_64';
-            }
-            else {
-              target = '12.0';
-              arch='armv8';
-            }
-            core.exportVariable('MACOSX_DEPLOYMENT_TARGET', target);
-            core.exportVariable('CMAKE_OSX_DEPLOYMENT_TARGET', target);
-            core.exportVariable('PKG_ARCH', arch);
 
       #***********************************#
       # Build steps (one per platform...) #

conan-profiles/conan-profile-macOS-ARM64

@@ -3,10 +3,10 @@ include(conan-profile-common)
 [settings]
 os=Macos
 # 14.2 is required by opensubdiv for metal
-os.version=14.2
+os.version=15.6
 arch=armv8
 compiler=apple-clang
-compiler.version=15
+compiler.version=17
 compiler.cppstd={{ os.getenv("CXX_VERSION") }}
 compiler.libcxx=libc++
 
@@ -18,8 +18,14 @@ minizip-ng/*:with_libcomp=False
 embree/*:shared=True
 
 [buildenv]
-CXX=clang++
-CC=clang
+PKG_ARCH=armv8
+# 14.2 is required by opensubdiv for metal
+# See also macos_var.cmake
+MACOSX_DEPLOYMENT_TARGET=14.2
 
 [conf]
-&:tools.build:cxxflags=["-O3"]
+&:tools.build:cxxflags+=["-O3"]
+tools.cmake.cmaketoolchain:user_toolchain+={{profile_dir}}/macos_var.cmake
+openvdb/*:tools.build:cxxflags+=["-Wno-error", "-Wno-missing-template-arg-list-after-template-kw"]
+
+# vim: ft=conf

conan-profiles/conan-profile-macOS-X64

@@ -2,17 +2,17 @@ include(conan-profile-common)
 
 [settings]
 os=Macos
-os.version=10.15
+os.version=15.6
 arch=x86_64
 compiler=apple-clang
-compiler.version=14.0
+compiler.version=17
 compiler.cppstd={{ os.getenv("CXX_VERSION") }}
 compiler.libcxx=libc++
 
-spdlog/*:compiler=clang
-spdlog/*:compiler.version=20
-spdlog/*:compiler.cppstd={{ os.getenv("CXX_VERSION") }}
-spdlog/*:compiler.libcxx=libc++
+#spdlog/*:compiler=clang
+#spdlog/*:compiler.version=20
+#spdlog/*:compiler.cppstd={{ os.getenv("CXX_VERSION") }}
+#spdlog/*:compiler.libcxx=libc++
 
 [options]
 minizip-ng/*:with_zlib=True
@@ -22,9 +22,16 @@ opensubdiv/*:with_metal=False
 embree/*:shared=True
 
 [buildenv]
-CXX=clang++
-CC=clang
+PKG_ARCH=x86_64
+# 14.2 is required by opensubdiv for metal
+# See also macos_var.cmake
+MACOSX_DEPLOYMENT_TARGET=14.2
 
 [conf]
-&:tools.build:cxxflags+=["-ftree-vectorize", "-march=x86-64-v3", "-O3", "-mno-avx2"]
+#&:tools.build:cxxflags+=["-ftree-vectorize", "-march=x86-64-v3", "-O3", "-mno-avx2"]
 # NB: Github MacOS X64 runner does not support avx2 nor avx512
+&:tools.build:cxxflags+=["-ftree-vectorize", "-march=x86-64-v3", "-O3"]
+tools.cmake.cmaketoolchain:user_toolchain+={{profile_dir}}/macos_var.cmake
+openvdb/*:tools.build:cxxflags+=["-Wno-error", "-Wno-missing-template-arg-list-after-template-kw"]
+
+# vim: ft=conf

conan-profiles/macos_var.cmake

@@ -0,0 +1,3 @@
+# This file injects CMake variables in MacOS build
+# 14.2 is required by opensubdiv for metal
+set(CMAKE_OSX_DEPLOYMENT_TARGET "14.2" CACHE STRING "")