3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 04:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch '5.3'

Browse source
This commit is contained in:
Jelle Spijker 2023-03-08 13:25:22 +01:00
commit 7a15e5098f
No known key found for this signature in database
GPG key ID: 034D1C0527888B65
2 changed files with 6 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
conanfile.py
View file

@ -26,7 +26,7 @@ class CuraConan(ConanFile):
no_copy_source = True # We won't build so no need to copy sources to the build folder
# FIXME: Remove specific branch once merged to main
python_requires = "umbase/[>=0.1.7]@ultimaker/stable", "translationextractor/[>=2.0.0]@ultimaker/stable"
python_requires = "umbase/[>=0.1.7]@ultimaker/stable", "translationextractor/[>=2.1.1]@ultimaker/stable"
python_requires_extend = "umbase.UMBaseConanfile"
options = {
@ -340,7 +340,8 @@ class CuraConan(ConanFile):
vb.generate()
# FIXME: once m4, autoconf, automake are Conan V2 ready use self.win_bash and add gettext as base tool_requirement
pot = self.python_requires["translationextractor"].module.ExtractTranslations(self)
cpp_info = self.dependencies["gettext"].cpp_info
pot = self.python_requires["translationextractor"].module.ExtractTranslations(self, cpp_info.bindirs[0])
pot.generate()
def build(self):