Use different icon formats depending on OS

Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-06-14 11:37:43 +02:00 committed by Jelle Spijker
parent 3e67566aad
commit ffca22971e
3 changed files with 9 additions and 3 deletions

View file

@ -66,7 +66,10 @@
- "."
- "../uranium"
- "../libcharon"
icon: "./icons/Cura.ico"
icon:
Windows: "./icons/Cura.ico"
Macos: "./icons/cura.icns"
Linux: ".icons/cura-128.png"
"5.1.0-CURA-9365":
conan:
curaengine: "curaengine/latest@ultimaker/cura-9365"
@ -135,4 +138,7 @@
- "."
- "../uranium"
- "../libcharon"
icon: "./icons/Cura.ico"
icon:
Windows: "./icons/Cura.ico"
Macos: "./icons/cura.icns"
Linux: ".icons/cura-128.png"

View file

@ -188,7 +188,7 @@ class CuraConan(ConanFile):
hiddenimports = pyinstaller_metadata["hiddenimports"],
collect_all = pyinstaller_metadata["collect_all"],
pathex = pathex,
icon = str(Path(self.source_folder, pyinstaller_metadata["icon"]))
icon = pyinstaller_metadata["icon"][str(self.settings.os)]
))
def layout(self):

Binary file not shown.