diff --git a/CHANGES b/CHANGES index 08c798468..b3c34777e 100644 --- a/CHANGES +++ b/CHANGES @@ -23,6 +23,7 @@ Other fixes: - LR35902: Fix disassembly of several CB-prefix instructions - Qt: Fix overrides getting discarded (fixes mgba.io/i/1354) - Qt: Fix saved scale not getting set on resize (fixes mgba.io/i/1074) + - CMake: Fix .deb imagemagick dependencies Misc: - GBA Savedata: EEPROM performance fixes - GBA Savedata: Automatically map 1Mbit Flash files as 1Mbit Flash diff --git a/CMakeLists.txt b/CMakeLists.txt index 2628c3e83..df3aa8cff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -563,11 +563,11 @@ if(USE_MAGICK) list(APPEND DEPENDENCY_LIB ${MAGICKWAND_LIBRARIES}) string(REGEX MATCH "^[0-9]+\\.[0-9]+" MAGICKWAND_VERSION_PARTIAL ${MagickWand_VERSION}) string(REGEX MATCH "^[0-9]+" MAGICKWAND_VERSION_MAJOR ${MagickWand_VERSION}) - if(${MAGICKWAND_VERSION_PARTIAL} EQUAL "6.7") + if(${MAGICKWAND_VERSION_PARTIAL} STREQUAL "6.7") set(MAGICKWAND_DEB_VERSION "5") - elseif(${MagickWand_VERSION} EQUAL "6.9.10") + elseif(${MagickWand_VERSION} STREQUAL "6.9.10") set(MAGICKWAND_DEB_VERSION "-6.q16-6") - elseif(${MagickWand_VERSION} EQUAL "6.9.7") + elseif(${MagickWand_VERSION} STREQUAL "6.9.7") set(MAGICKWAND_DEB_VERSION "-6.q16-3") else() set(MAGICKWAND_DEB_VERSION "-6.q16-2")