3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 21:27:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'main' into CURA-10831

Browse source 
# Conflicts:
#	conanfile.py
This commit is contained in:
Jelle Spijker 2023-12-04 11:05:10 +01:00
commit a0f161cd18
No known key found for this signature in database
GPG key ID: 034D1C0527888B65
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
conanfile.py
View file

@ -330,7 +330,8 @@ class CuraConan(ConanFile):
self.requires("cpython/3.10.4@ultimaker/stable") self.requires("cpython/3.10.4@ultimaker/stable")
self.requires("openssl/3.2.0") self.requires("openssl/3.2.0")
self.requires("boost/1.82.0") self.requires("boost/1.82.0")
self.requires("fmt/9.0.0") self.requires("spdlog/1.12.0")
self.requires("fmt/10.1.1")
self.requires("zlib/1.2.13") self.requires("zlib/1.2.13")
def build_requirements(self): def build_requirements(self):