Skip to content
2 changes: 1 addition & 1 deletion conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading