3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-02 07:11:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge branch '5.3'

Browse source
This commit is contained in:
Jelle Spijker 2023-03-08 09:09:02 +01:00
commit 7fc7b238cd
No known key found for this signature in database
GPG key ID: 034D1C0527888B65
37 changed files with 49 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conanfile.py
View file

@ -305,7 +305,7 @@ class CuraConan(ConanFile):
if self.options.devtools:
if self.settings.os != "Windows" or self.conf.get("tools.microsoft.bash:path", check_type = str):
# FIXME: once m4, autoconf, automake are Conan V2 ready use self.win_bash and add gettext as base tool_requirement
self.tool_requires("gettext/0.21", force_host_context=True)
self.tool_requires("gettext/0.21@ultimaker/testing")
def layout(self):
self.folders.source = "."