Merge branch '5.5' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2023-10-11 15:36:16 +02:00
commit 9f1be535eb
No known key found for this signature in database
GPG key ID: C85F7A3AF1BAA7C4
42 changed files with 64075 additions and 71735 deletions

View file

@ -398,10 +398,10 @@ class CuraConan(ConanFile):
vb = VirtualBuildEnv(self)
vb.generate()
# FIXME: once m4, autoconf, automake are Conan V2 ready use self.win_bash and add gettext as base tool_requirement
cpp_info = self.dependencies["gettext"].cpp_info
pot = self.python_requires["translationextractor"].module.ExtractTranslations(self, cpp_info.bindirs[0])
pot.generate()
# # FIXME: once m4, autoconf, automake are Conan V2 ready use self.win_bash and add gettext as base tool_requirement
# cpp_info = self.dependencies["gettext"].cpp_info
# pot = self.python_requires["translationextractor"].module.ExtractTranslations(self, cpp_info.bindirs[0])
# pot.generate()
def build(self):
if self.options.devtools: