diff options
| author | j.spijker@ultimaker.com <jelle spijker> | 2022-07-01 07:37:34 +0300 |
|---|---|---|
| committer | Jelle Spijker <j.spijker@ultimaker.com> | 2022-07-01 07:37:34 +0300 |
| commit | f3ebf984407c4530b506a8126056c8760ddf8277 (patch) | |
| tree | 383abcc656d6a524d94d5f8629d6e361998db246 | |
| parent | 3fe0f26e94b6e54a738b4cfeab35cffba17eafc7 (diff) | |
Only use upx on Windows
Contributes to CURA-9365
| -rw-r--r-- | Ultimaker-Cura.spec.jinja | 2 | ||||
| -rw-r--r-- | conanfile.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Ultimaker-Cura.spec.jinja b/Ultimaker-Cura.spec.jinja index f7108d5aec..9c73e8a4ca 100644 --- a/Ultimaker-Cura.spec.jinja +++ b/Ultimaker-Cura.spec.jinja @@ -39,7 +39,7 @@ exe = EXE( debug=False, bootloader_ignore_signals=False, strip=False, - upx=True, + upx={{ upx }}, console=False, disable_windowed_traceback=False, argv_emulation=False, diff --git a/conanfile.py b/conanfile.py index 80df016d6f..60d6c63823 100644 --- a/conanfile.py +++ b/conanfile.py @@ -188,7 +188,8 @@ class CuraConan(ConanFile): hiddenimports = pyinstaller_metadata["hiddenimports"], collect_all = pyinstaller_metadata["collect_all"], icon = icon_path, - entitlements_file = entitlements_file + entitlements_file = entitlements_file, + upx = str(self.settings.os == "Windows") )) def source(self): |