From 3220c741812ab6df93aba2d1d53eab6f693e7401 Mon Sep 17 00:00:00 2001 From: xengineering Date: Thu, 28 Nov 2024 19:52:51 +0100 Subject: Drop JPEG support This is done because of three reasons: - CMake code is simplified - `ImageMagick` dependency is not needed anymore - PNG in contrast to JPEG only uses lossless compression [1] - PNG in contrast to JPEG can store transparent pixels [1] - build time is reduced (not yet relevant but will be) [1]: https://www.adobe.com/creativecloud/file-types/image/comparison/jpeg-vs-png.html --- CMakeLists.txt | 38 ++++++++++++-------------------------- README.md | 2 -- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb6758f..bc08e39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,36 +10,22 @@ set(formats pdf svg png - jpg ) foreach(icon ${icons}) foreach(format ${formats}) - if(format STREQUAL jpg) - add_custom_command( - OUTPUT - ${CMAKE_CURRENT_BINARY_DIR}/icons/${icon}.${format} - COMMAND - magick - ${CMAKE_CURRENT_BINARY_DIR}/icons/${icon}.png - ${CMAKE_CURRENT_BINARY_DIR}/icons/${icon}.${format} - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/icons/${icon}.png - ) - else() - add_custom_command( - OUTPUT - ${CMAKE_CURRENT_BINARY_DIR}/icons/${icon}.${format} - COMMAND - SELF_CALL=xxx # https://gitlab.com/inkscape/inkscape/-/issues/4716 - inkscape - --export-type=${format} - --export-filename=${CMAKE_CURRENT_BINARY_DIR}/icons/${icon}.${format} - ${CMAKE_CURRENT_SOURCE_DIR}/icons/${icon}.svg - DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/icons/${icon}.svg - ) - endif() + add_custom_command( + OUTPUT + ${CMAKE_CURRENT_BINARY_DIR}/icons/${icon}.${format} + COMMAND + SELF_CALL=xxx # https://gitlab.com/inkscape/inkscape/-/issues/4716 + inkscape + --export-type=${format} + --export-filename=${CMAKE_CURRENT_BINARY_DIR}/icons/${icon}.${format} + ${CMAKE_CURRENT_SOURCE_DIR}/icons/${icon}.svg + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/icons/${icon}.svg + ) add_custom_target( "icon-${icon}-${format}" ALL diff --git a/README.md b/README.md index 3e34b06..1f64306 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,6 @@ output formats. - [Inkscape][1] - [CMake][2] - [Ninja][3] -- [ImageMagick][4] ## Usage @@ -41,4 +40,3 @@ The results are placed inside the `build` folder. [1]: https://inkscape.org [2]: https://cmake.org [3]: https://ninja-build.org -[4]: https://imagemagick.org -- cgit v1.2.3-70-g09d2