From c255f44e7ce5e0b006efcd540d1d9062081c0069 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Sun, 3 Jan 2021 14:43:41 +0100 Subject: [PATCH] pics: Provide custom target for generating the macOS iconset In preparation for modernizing package generation on macOS that will replace our custom scripts currently used, provide a custom CMake target for generating the iconset on demand. Rename the iconset directory to 'quassel.iconset', otherwise iconutil refuses to work. --- pics/CMakeLists.txt | 8 ++++++++ pics/{iconset => quassel.iconset}/icon_128x128.png | Bin .../icon_128x128@2x.png | Bin pics/{iconset => quassel.iconset}/icon_16x16.png | Bin pics/{iconset => quassel.iconset}/icon_16x16@2x.png | Bin pics/{iconset => quassel.iconset}/icon_256x256.png | Bin .../icon_256x256@2x.png | Bin pics/{iconset => quassel.iconset}/icon_32x32.png | Bin pics/{iconset => quassel.iconset}/icon_32x32@2x.png | Bin pics/{iconset => quassel.iconset}/icon_512x512.png | Bin .../icon_512x512@2x.png | Bin 11 files changed, 8 insertions(+) rename pics/{iconset => quassel.iconset}/icon_128x128.png (100%) rename pics/{iconset => quassel.iconset}/icon_128x128@2x.png (100%) rename pics/{iconset => quassel.iconset}/icon_16x16.png (100%) rename pics/{iconset => quassel.iconset}/icon_16x16@2x.png (100%) rename pics/{iconset => quassel.iconset}/icon_256x256.png (100%) rename pics/{iconset => quassel.iconset}/icon_256x256@2x.png (100%) rename pics/{iconset => quassel.iconset}/icon_32x32.png (100%) rename pics/{iconset => quassel.iconset}/icon_32x32@2x.png (100%) rename pics/{iconset => quassel.iconset}/icon_512x512.png (100%) rename pics/{iconset => quassel.iconset}/icon_512x512@2x.png (100%) diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt index 8759f380..78ae93ac 100644 --- a/pics/CMakeLists.txt +++ b/pics/CMakeLists.txt @@ -10,3 +10,11 @@ if (WANT_MONO OR WANT_QTCLIENT) qt-logo-32.png ) endif() + +# On macOS, the individual icons should be converted into an iconset +add_custom_command( + COMMENT "Creating iconset for macOS" + OUTPUT quassel.icns + COMMAND iconutil ARGS -c icns -o ${CMAKE_CURRENT_BINARY_DIR}/quassel.icns ${CMAKE_CURRENT_SOURCE_DIR}/quassel.iconset +) +add_custom_target(MacOsIcons DEPENDS quassel.icns) diff --git a/pics/iconset/icon_128x128.png b/pics/quassel.iconset/icon_128x128.png similarity index 100% rename from pics/iconset/icon_128x128.png rename to pics/quassel.iconset/icon_128x128.png diff --git a/pics/iconset/icon_128x128@2x.png b/pics/quassel.iconset/icon_128x128@2x.png similarity index 100% rename from pics/iconset/icon_128x128@2x.png rename to pics/quassel.iconset/icon_128x128@2x.png diff --git a/pics/iconset/icon_16x16.png b/pics/quassel.iconset/icon_16x16.png similarity index 100% rename from pics/iconset/icon_16x16.png rename to pics/quassel.iconset/icon_16x16.png diff --git a/pics/iconset/icon_16x16@2x.png b/pics/quassel.iconset/icon_16x16@2x.png similarity index 100% rename from pics/iconset/icon_16x16@2x.png rename to pics/quassel.iconset/icon_16x16@2x.png diff --git a/pics/iconset/icon_256x256.png b/pics/quassel.iconset/icon_256x256.png similarity index 100% rename from pics/iconset/icon_256x256.png rename to pics/quassel.iconset/icon_256x256.png diff --git a/pics/iconset/icon_256x256@2x.png b/pics/quassel.iconset/icon_256x256@2x.png similarity index 100% rename from pics/iconset/icon_256x256@2x.png rename to pics/quassel.iconset/icon_256x256@2x.png diff --git a/pics/iconset/icon_32x32.png b/pics/quassel.iconset/icon_32x32.png similarity index 100% rename from pics/iconset/icon_32x32.png rename to pics/quassel.iconset/icon_32x32.png diff --git a/pics/iconset/icon_32x32@2x.png b/pics/quassel.iconset/icon_32x32@2x.png similarity index 100% rename from pics/iconset/icon_32x32@2x.png rename to pics/quassel.iconset/icon_32x32@2x.png diff --git a/pics/iconset/icon_512x512.png b/pics/quassel.iconset/icon_512x512.png similarity index 100% rename from pics/iconset/icon_512x512.png rename to pics/quassel.iconset/icon_512x512.png diff --git a/pics/iconset/icon_512x512@2x.png b/pics/quassel.iconset/icon_512x512@2x.png similarity index 100% rename from pics/iconset/icon_512x512@2x.png rename to pics/quassel.iconset/icon_512x512@2x.png -- 2.20.1