From 5f6d59c63d3ac3936bc1afd51640fad84037dcf9 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Sat, 25 Jun 2022 18:40:27 +0200 Subject: [PATCH] Only build Arcus, Savitar and pynest2d shared Contributes to CURA-9365 --- conandata.yml | 17 ----------------- conanfile.py | 17 +++-------------- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/conandata.yml b/conandata.yml index 52cec57354..8b3d63d738 100644 --- a/conandata.yml +++ b/conandata.yml @@ -8,10 +8,6 @@ - "fdm_materials/(latest)@ultimaker/stable" - "cura_binary_data/(latest)@ultimaker/stable" - "cpython/3.10.4" - - "libffi/3.2.1" - - "mpdecimal/2.5.0" - - "tcl/8.6.10" - - "tk/8.6.10" runinfo: entrypoint: "cura_app.py" pyinstaller: @@ -84,10 +80,6 @@ - "fdm_materials/5.1.0" - "cura_binary_data/5.1.0" - "cpython/3.10.4" - - "libffi/3.2.1" - - "mpdecimal/2.5.0" - - "tcl/8.6.10" - - "tk/8.6.10" runinfo: entrypoint: "cura_app.py" pyinstaller: @@ -160,10 +152,6 @@ - "fdm_materials/(latest)@ultimaker/stable" - "cura_binary_data/(latest)@ultimaker/stable" - "cpython/3.10.4" - - "libffi/3.2.1" - - "mpdecimal/2.5.0" - - "tcl/8.6.10" - - "tk/8.6.10" runinfo: entrypoint: "cura_app.py" pyinstaller: @@ -236,11 +224,6 @@ - "fdm_materials/(latest)@ultimaker/cura_9365" - "cura_binary_data/(latest)@ultimaker/cura_9365" - "cpython/3.10.4" - - "libffi/3.2.1" - - "mpdecimal/2.5.0" - - "tcl/8.6.10" - - "tk/8.6.10" - - "zlib/1.2.12" runinfo: entrypoint: "cura_app.py" pyinstaller: diff --git a/conanfile.py b/conanfile.py index 4a48394e47..3614b342f9 100644 --- a/conanfile.py +++ b/conanfile.py @@ -84,20 +84,9 @@ class CuraConan(ConanFile): return ["requirements.txt", "requirements-ultimaker.txt"] def configure(self): - self.options["*"].shared = True - self.options["bzip2"].shared = False - self.options["expat"].shared = False - self.options["openssl"].shared = False - self.options["sqlite3"].shared = False - self.options["tcl"].shared = False - self.options["tk"].shared = False - self.options["xz_utils"].shared = False - self.options["zlib"].shared = False - 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 + self.options["arcus"].shared = True + self.options["savitar"].shared = True + self.options["pynest2d"].shared = True def validate(self): if self.version and tools.Version(self.version) <= tools.Version("4"):