646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
14 lines
923 B
Diff
14 lines
923 B
Diff
diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
|
|
index d231e3d1..73f389a2 100644
|
|
--- a/resources/CMakeLists.txt
|
|
+++ b/resources/CMakeLists.txt
|
|
@@ -62,7 +62,7 @@ if(WIN32)
|
|
DEPENDS "${CMAKE_SOURCE_DIR}/resources/GrandOrgue.manifest")
|
|
LIST(APPEND DEPLIST "${RESOURCEDIR}/GOIcon.ico" "${RESOURCEDIR}/GrandOrgue.rc" "${RESOURCEDIR}/GrandOrgue.manifest")
|
|
elseif(APPLE)
|
|
- ADD_CUSTOM_COMMAND(OUTPUT "${RESOURCEDIR}/GrandOrgue.icns" COMMAND iconutil -c icns --output "${RESOURCEDIR}/GrandOrgue.icns" ${GENERATED_ICONS_DIR} DEPENDS ${GENERATED_ICONS})
|
|
+ ADD_CUSTOM_COMMAND(OUTPUT "${RESOURCEDIR}/GrandOrgue.icns" COMMAND png2icns "${RESOURCEDIR}/GrandOrgue.icns" ${GENERATED_ICONS_DIR}/*{16,32,128,256,512,1024}.png DEPENDS ${GENERATED_ICONS})
|
|
INSTALL(FILES "${RESOURCEDIR}/GrandOrgue.icns" DESTINATION "${RESOURCEINSTDIR}")
|
|
LIST(APPEND DEPLIST "${RESOURCEDIR}/GrandOrgue.icns")
|
|
elseif(UNIX)
|