From b05a975feeef0abfa5dd38837217b8717e0e7539 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Wed, 31 Mar 2021 18:44:44 +0100 Subject: [PATCH] Make the icons build step optional. 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.) --- icons/icons.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/icons/icons.cmake b/icons/icons.cmake index 5bd9285..873c3c7 100644 --- a/icons/icons.cmake +++ b/icons/icons.cmake @@ -4,8 +4,13 @@ if(NOT build_icons) return() endif() -find_program(CONVERT convert REQUIRED) -find_program(IDENTIFY identify REQUIRED) +find_program(CONVERT convert) +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 # image part way through the animation of a move. This setting will