diff --git a/conandata.yml b/conandata.yml index 2c4e4014..d0ec201c 100644 --- a/conandata.yml +++ b/conandata.yml @@ -9,15 +9,60 @@ requirements: - "protobuf/3.17.1" requirements_pyarcus: "None": - - "cpython/3.10.4" + - "cpython/3.10.4@ultimaker/testing" - "zlib/1.2.12" + - "libffi/3.2.1" + - "mpdecimal/2.5.1@ultimaker/testing" + - "tcl/8.6.10@ultimaker/testing" + - "tk/8.6.10@ultimaker/testing" "5.1.0": - - "cpython/3.10.4" + - "cpython/3.10.4@ultimaker/testing" - "zlib/1.2.12" + - "libffi/3.2.1" + - "mpdecimal/2.5.1@ultimaker/testing" + - "tcl/8.6.10@ultimaker/testing" + - "tk/8.6.10@ultimaker/testing" "5.1.0-beta": - - "cpython/3.10.4" + - "cpython/3.10.4@ultimaker/testing" - "zlib/1.2.12" + - "libffi/3.2.1" + - "mpdecimal/2.5.1@ultimaker/testing" + - "tcl/8.6.10@ultimaker/testing" + - "tk/8.6.10@ultimaker/testing" "5.1.0-cura_9365": - - "cpython/3.10.4" + - "cpython/3.10.4@ultimaker/testing" - "zlib/1.2.12" + - "libffi/3.2.1" + - "mpdecimal/2.5.1@ultimaker/testing" + - "tcl/8.6.10@ultimaker/testing" + - "tk/8.6.10@ultimaker/testing" +build_requirements_pyarcus: + "None": + - "cpython/3.10.4@ultimaker/testing" + - "sip/6.5.1@ultimaker/testing" + - "libffi/3.2.1" + - "mpdecimal/2.5.1@ultimaker/testing" + - "tcl/8.6.10@ultimaker/testing" + - "tk/8.6.10@ultimaker/testing" + "5.1.0": + - "cpython/3.10.4@ultimaker/testing" + - "sip/6.5.1@ultimaker/testing" + - "libffi/3.2.1" + - "mpdecimal/2.5.1@ultimaker/testing" + - "tcl/8.6.10@ultimaker/testing" + - "tk/8.6.10@ultimaker/testing" + "5.1.0-beta": + - "cpython/3.10.4@ultimaker/testing" + - "sip/6.5.1@ultimaker/testing" + - "libffi/3.2.1" + - "mpdecimal/2.5.1@ultimaker/testing" + - "tcl/8.6.10@ultimaker/testing" + - "tk/8.6.10@ultimaker/testing" + "5.1.0-cura_9365": + - "cpython/3.10.4@ultimaker/testing" + - "sip/6.5.1@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 a85ecfb0..c6759f30 100644 --- a/conanfile.py +++ b/conanfile.py @@ -40,6 +40,11 @@ class ArcusConan(ConanFile): "revision": "auto" } + def build_requirements(self): + if self.options.build_python: + for req in self._um_data(self.version)["build_requirements_pyarcus"]: + self.tool_requires(req) + def requirements(self): for req in self._um_data(self.version)["requirements"]: self.requires(req) @@ -52,7 +57,12 @@ def config_options(self): del self.options.fPIC def configure(self): - self.options["*"].shared = self.options.shared + self.options["*"].shared = True + if self.settings.os == "Windows": + # Needed to compile CPython on Windows with our configuration for Visual Studio + self.options["mpdecimal"].cxx = True + self.options["mpdecimal"].shared = False + self.options["libffi"].shared = False def validate(self): if self.settings.compiler.get_safe("cppstd"):