zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make the icons build step optional.

Browse Source 
This way, ImageMagick is no longer a hard build dependency. For
developers or users, building puzzles without nice icons is preferable
to not building them at all.

(Also, thanks to Michael Quevillon for pointing out very promptly that
my use of 'REQUIRED' in the find_program command was implicitly
depending on a version of CMake in advance of my minimum_required
specification. This change fixes that too, in passing.)
This commit is contained in:
Simon Tatham
2021-03-31 18:44:44 +01:00
parent 71c66b6fbd
commit b05a975fee
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
icons/icons.cmake
View File

@ -4,8 +4,13 @@ if(NOT build_icons)
return() return()
endif() endif()
find_program(CONVERT convert REQUIRED) find_program(CONVERT convert)
find_program(IDENTIFY identify REQUIRED) find_program(IDENTIFY identify)
if(NOT CONVERT OR NOT IDENTIFY)
message(WARNING "Puzzle icons cannot be rebuilt (did not find ImageMagick)")
set(build_icons FALSE)
return()
endif()
# For puzzles which have animated moves, it's nice to show the sample # For puzzles which have animated moves, it's nice to show the sample
# image part way through the animation of a move. This setting will # image part way through the animation of a move. This setting will