macos-15

Author: howetuft

.github/workflows/build.yml

@@ -28,8 +28,9 @@ jobs:
     strategy:
       fail-fast: False
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-15-intel, macos-15]
+        #os: [ubuntu-latest, windows-latest, macos-15-intel, macos-15]
         #os: [macos-15-intel, macos-15]
+        os: [macos-15]
     env:
       BUILD_TYPE: Release
       # SANITIZE: true # uncomment to sanitize

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++
 
@@ -16,10 +16,11 @@ boost/*:without_locale=True
 minizip-ng/*:with_zlib=True
 minizip-ng/*:with_libcomp=False
 embree/*:shared=True
+openvdb/*:tools.cmake.cmaketoolchain:user_toolchain+={{profile_dir}}/macos_var.cmake
 
 [buildenv]
-CXX=clang++
-CC=clang
+VERBOSE=1
 
 [conf]
-&:tools.build:cxxflags=["-O3"]
+&:tools.build:cxxflags+=["-O3", "-w", "-Wno-error"]
+openvdb:tools.build:cxxflags+=["-Wno-error", "-Wno-missing-template-arg-list-after-template-kw"]

conan-profiles/macos_var.cmake

@@ -0,0 +1,2 @@
+# This file injects OPENVDB variable
+set(OPENVDB_CXX_STRICT OFF CACHE BOOL "")

conanfile.py

@@ -49,18 +49,19 @@ class LuxCoreDeps(ConanFile):
 
     requires = [
         f"openvdb/{OPENVDB_VERSION}",
-        f"embree/{EMBREE_VERSION}",
-        f"oidn/{OIDN_VERSION}@luxcore/luxcore",
-        f"opensubdiv/{OPENSUBDIV_VERSION}",
-        f"openimageio/{OIIO_VERSION}",
-        f"imgui/{IMGUI_VERSION}",
-        f"glfw/{GLFW_VERSION}",
-        f"imguifiledialog/{IMGUIFILEDIALOG_VERSION}@luxcore/luxcore",
+        # f"embree/{EMBREE_VERSION}",
+        # f"oidn/{OIDN_VERSION}@luxcore/luxcore",
+        # f"opensubdiv/{OPENSUBDIV_VERSION}",
+        # f"openimageio/{OIIO_VERSION}",
+        # f"imgui/{IMGUI_VERSION}",
+        # f"glfw/{GLFW_VERSION}",
+        # f"imguifiledialog/{IMGUIFILEDIALOG_VERSION}@luxcore/luxcore",
     ]
 
     settings = "os", "compiler", "build_type", "arch"
 
     def requirements(self):
+        return # TODO
         self.requires(
             f"onetbb/{TBB_VERSION}",
             override=True,