CMake: Fix .deb imagemagick dependencies
Vicki Pfau vi@endrift.com
Sun, 17 Mar 2019 16:40:52 -0700
2 files changed,
4 insertions(+),
3 deletions(-)
M
CHANGES
→
CHANGES
@@ -10,6 +10,7 @@ - Qt: Fix load recent from archive (fixes mgba.io/i/1325)
- 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
M
CMakeLists.txt
→
CMakeLists.txt
@@ -559,11 +559,11 @@ list(APPEND FEATURE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/feature/imagemagick/imagemagick-gif-encoder.c")
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")