From 11ae4a66bbce0aa8b7ad6b6d0a93e5e1cf9524b2 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Sun, 17 Mar 2019 16:40:52 -0700 Subject: [PATCH] CMake: Fix .deb imagemagick dependencies --- CHANGES | 1 + CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index ab50718ca..e4d256623 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,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: - Qt: Add missing HEVC NVENC option (fixes mgba.io/i/1323) - Qt: Improve camera initialization diff --git a/CMakeLists.txt b/CMakeLists.txt index f5b7ddffa..ecfb10c02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -559,11 +559,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")