ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: Fix .deb imagemagick dependencies

This commit is contained in:
Vicki Pfau 2019-03-17 16:40:52 -07:00
parent d4ec95cf4f
commit 11ae4a66bb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -10,6 +10,7 @@ Other fixes:
- LR35902: Fix disassembly of several CB-prefix instructions - LR35902: Fix disassembly of several CB-prefix instructions
- Qt: Fix overrides getting discarded (fixes mgba.io/i/1354) - Qt: Fix overrides getting discarded (fixes mgba.io/i/1354)
- Qt: Fix saved scale not getting set on resize (fixes mgba.io/i/1074) - Qt: Fix saved scale not getting set on resize (fixes mgba.io/i/1074)
- CMake: Fix .deb imagemagick dependencies
Misc: Misc:
- Qt: Add missing HEVC NVENC option (fixes mgba.io/i/1323) - Qt: Add missing HEVC NVENC option (fixes mgba.io/i/1323)
- Qt: Improve camera initialization - Qt: Improve camera initialization

6
CMakeLists.txt
View File

@ -559,11 +559,11 @@ if(USE_MAGICK)
list(APPEND DEPENDENCY_LIB ${MAGICKWAND_LIBRARIES}) list(APPEND DEPENDENCY_LIB ${MAGICKWAND_LIBRARIES})
string(REGEX MATCH "^[0-9]+\\.[0-9]+" MAGICKWAND_VERSION_PARTIAL ${MagickWand_VERSION}) string(REGEX MATCH "^[0-9]+\\.[0-9]+" MAGICKWAND_VERSION_PARTIAL ${MagickWand_VERSION})
string(REGEX MATCH "^[0-9]+" MAGICKWAND_VERSION_MAJOR ${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") 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") 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") set(MAGICKWAND_DEB_VERSION "-6.q16-3")
else() else()
set(MAGICKWAND_DEB_VERSION "-6.q16-2") set(MAGICKWAND_DEB_VERSION "-6.q16-2")