Merge branch '5.3'

This commit is contained in:
Jelle Spijker 2023-03-08 11:28:58 +01:00
commit 769ff3c736
No known key found for this signature in database
GPG key ID: 034D1C0527888B65
2 changed files with 2 additions and 2 deletions

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@ultimaker/testing")
self.tool_requires("gettext/0.21@ultimaker/testing", force_host_context = True)
def layout(self):
self.folders.source = "."