From d81ab256201e5bdd1a5e51a559d63d22de98a978 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 24 Nov 2025 08:46:00 +0100 Subject: [PATCH 1/5] Add minimum C++ standard property to conanfile Introduces the _min_cppstd property to specify C++20 as the minimum required standard for the project. --- conanfile.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conanfile.py b/conanfile.py index 386628eafd..d281338aba 100644 --- a/conanfile.py +++ b/conanfile.py @@ -43,6 +43,10 @@ class CuraEngineConan(ConanFile): "with_cura_resources": False, } + @property + def _min_cppstd(self): + return 20 + @property def _compilers_minimum_version(self): return { From c6dbe16ec33685103b6b74b47e6a69c4586543ce Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 2 Dec 2025 11:27:33 +0100 Subject: [PATCH 2/5] Remove unused _min_cppstd property and update options Deleted the debug property from CuraEngineConan. Added logic to disable tbbproxy for ARM64 Windows platforms in the requirements configuration. --- conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index d281338aba..6038e2492e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -43,9 +43,6 @@ class CuraEngineConan(ConanFile): "with_cura_resources": False, } - @property - def _min_cppstd(self): - return 20 @property def _compilers_minimum_version(self): @@ -97,6 +94,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 From d5cb2be8272bb2a080e9c72da887b4e6c141e0bf Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 2 Dec 2025 11:28:28 +0100 Subject: [PATCH 3/5] lint --- conanfile.py | 1 - 1 file changed, 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 6038e2492e..11935ade24 100644 --- a/conanfile.py +++ b/conanfile.py @@ -43,7 +43,6 @@ class CuraEngineConan(ConanFile): "with_cura_resources": False, } - @property def _compilers_minimum_version(self): return { From a61360145470ca04bc4580ee72ef8c40b570fc8d Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sun, 1 Mar 2026 10:10:28 +0100 Subject: [PATCH 4/5] Bump onetbb to 2022.3.0 in conandata Update conandata.yml to require onetbb/2022.3.0 (was 2022.2.0). This moves the Conan recipe to the newer oneTBB release to pick up upstream fixes and improvements. --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index ac1636758f..73e4dbdc08 100644 --- a/conandata.yml +++ b/conandata.yml @@ -3,7 +3,7 @@ commit: "unknown" requirements: - "scripta/[>=1.1.0]@ultimaker/testing" - "libpng/1.6.48" - - "onetbb/2022.2.0" + - "onetbb/2022.3.0" requirements_arcus: - "arcus/5.11.0" requirements_plugins: From b801f188d8fada686f2b29d95724a1b40762d6ab Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 9 Mar 2026 08:36:21 +0100 Subject: [PATCH 5/5] Add channel to cura_resources requirement Update conandata.yml to reference cura_resources as "cura_resources/5.13.0-alpha.0@ultimaker/testing" so Conan pulls the package from the Ultimaker testing channel. No other requirement entries were modified. --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index de83e29784..123dcece22 100644 --- a/conandata.yml +++ b/conandata.yml @@ -9,4 +9,4 @@ requirements_arcus: requirements_plugins: - "curaengine_grpc_definitions/0.3.2" requirements_cura_resources: - - "cura_resources/5.13.0-alpha.0" + - "cura_resources/5.13.0-alpha.0@ultimaker/testing"