Browse Source

Add target architecture for Macos

We should extend this Arm support in the future

Contributes to CURA-9365
j.spijker@ultimaker.com 2 years ago
parent
commit
f5789433ce
2 changed files with 3 additions and 2 deletions
  1. 1 1
      Ultimaker-Cura.spec.jinja
  2. 2 1
      conanfile.py

+ 1 - 1
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 }}'

+ 2 - 1
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):