diff --git a/conandata.yml b/conandata.yml index 0aa59b84f2..d5504caa1c 100644 --- a/conandata.yml +++ b/conandata.yml @@ -8,6 +8,7 @@ requirements: - "fdm_materials/(latest)@ultimaker/stable" - "cura_binary_data/(latest)@ultimaker/stable" - "cpython/3.10.4@ultimaker/testing" + - "libffi/3.2.1" - "mpdecimal/2.5.1@ultimaker/testing" - "tcl/8.6.10@ultimaker/testing" - "tk/8.6.10@ultimaker/testing" @@ -20,6 +21,7 @@ requirements: - "fdm_materials/5.1.0" - "cura_binary_data/5.1.0" - "cpython/3.10.4@ultimaker/testing" + - "libffi/3.2.1" - "mpdecimal/2.5.1@ultimaker/testing" - "tcl/8.6.10@ultimaker/testing" - "tk/8.6.10@ultimaker/testing" @@ -32,6 +34,7 @@ requirements: - "fdm_materials/[5.1.0-beta]@ultimaker/stable" - "cura_binary_data/[5.1.0-beta]@ultimaker/stable" - "cpython/3.10.4@ultimaker/testing" + - "libffi/3.2.1" - "mpdecimal/2.5.1@ultimaker/testing" - "tcl/8.6.10@ultimaker/testing" - "tk/8.6.10@ultimaker/testing" @@ -44,6 +47,7 @@ requirements: - "fdm_materials/[5.1.0-cura_9365]@ultimaker/testing" - "cura_binary_data/[5.1.0-cura_9365]@ultimaker/testing" - "cpython/3.10.4@ultimaker/testing" + - "libffi/3.2.1" - "mpdecimal/2.5.1@ultimaker/testing" - "tcl/8.6.10@ultimaker/testing" - "tk/8.6.10@ultimaker/testing" diff --git a/conanfile.py b/conanfile.py index 0a24eddd18..fc60b9a228 100644 --- a/conanfile.py +++ b/conanfile.py @@ -86,7 +86,10 @@ class CuraConan(ConanFile): def configure(self): self.options["*"].shared = True if self.settings.os == "Windows": - self.options["mpdecimal"].cxx = False + # Needed to compile CPython on Windows with our configuration voor Visual Studio + self.options["mpdecimal"].cxx = True + self.options["mpdecimal"].shared = False + self.options["libffi"].shared = False def validate(self): if self.version and tools.Version(self.version) <= tools.Version("4"):