diff --git a/conandata.yml b/conandata.yml index 03b1d906e7..429d6daf31 100644 --- a/conandata.yml +++ b/conandata.yml @@ -4,7 +4,7 @@ requirements: - "cura-formulae-engine/1.0.0" - "scripta/[>=1.1.0]@ultimaker/testing" - "libpng/1.6.48" - - "onetbb/2022.2.0" + - "onetbb/2022.3.0" - "zeus_expected/[>=1.1.1]" requirements_arcus: - "arcus/5.11.1" diff --git a/conanfile.py b/conanfile.py index a5ba3e885e..fa5aa7702b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -93,6 +93,9 @@ def configure(self): self.options["protobuf"].shared = False if self.options.enable_arcus: self.options["arcus"].shared = True + # ARM64 Windows: Disable tbbproxy (not available on ARM64 platforms) + if self.settings.os == "Windows" and self.settings.arch == "armv8": + self.options["onetbb"].tbbproxy = False # Force all libraries to be static for Emscripten builds if self.settings.os == "Emscripten": self.options["*"].shared = False