From 035815b4210107885d03fea7fe5059dfdfafac7b Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Fri, 21 Oct 2022 17:19:55 +0200 Subject: [PATCH] Only build mo on Unix Once M4, autoconf and automake are Conan v2 ready this can be reversed --- conanfile.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 32482ccf2f..9dfe60db81 100644 --- a/conanfile.py +++ b/conanfile.py @@ -291,14 +291,15 @@ class CuraConan(ConanFile): def build(self): if self.settings.os == "Windows": - self.win_bash = True # We need gettext, which requires the bash environment + return + # FIXME: once m4, autoconf, automake are Conan V2 ready self.win_bash = True # We need gettext, which requires the bash environment for po_file in self.source_path.joinpath("resources", "i18n").glob("**/*.po"): mo_file = self.build_path.joinpath(po_file.with_suffix('.mo').relative_to(self.source_path)) mkdir(self, str(unix_path(self, mo_file.parent))) self.run(f"msgfmt {po_file} -o {mo_file} -f", env="conanbuild") - self.win_bash = None + # FIXME: once m4, autoconf, automake are Conan V2 ready self.win_bash = None def generate(self): cura_run_envvars = self._cura_run_env.vars(self, scope = "run")