From f5789433ce0c2085769e9443a64d617b58045fc5 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Fri, 1 Jul 2022 07:00:34 +0200 Subject: [PATCH] Add target architecture for Macos We should extend this Arm support in the future Contributes to CURA-9365 --- Ultimaker-Cura.spec.jinja | 2 +- conanfile.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Ultimaker-Cura.spec.jinja b/Ultimaker-Cura.spec.jinja index ff6c5b9637..04ce3a4dfa 100644 --- a/Ultimaker-Cura.spec.jinja +++ b/Ultimaker-Cura.spec.jinja @@ -43,7 +43,7 @@ exe = EXE( console=False, disable_windowed_traceback=False, argv_emulation=False, - target_arch=None, + target_arch={{ target_arch }}, codesign_identity=os.getenv('CODESIGN_IDENTITY', None), entitlements_file={{ entitlements_file }}, bundle_identifier='{{ osx_bundle_identifier }}' diff --git a/conanfile.py b/conanfile.py index 4db9bbaef7..56c784e5ed 100644 --- a/conanfile.py +++ b/conanfile.py @@ -190,7 +190,8 @@ class CuraConan(ConanFile): icon = icon_path, entitlements_file = entitlements_file, osx_bundle_identifier = "nl.ultimaker.cura.dmg" if self.settings.os == "Macos" else "None", - upx = str(self.settings.os == "Windows") + upx = str(self.settings.os == "Windows"), + target_arch = "x86_64" if self.settings.os == "Macos" else "None" # FIXME: Make this dependent on the settings.arch_target )) def source(self):