summaryrefslogtreecommitdiffstats
path: root/Modules/FindImageMagick.cmake
diff options
context:
space:
mode:
authorRex Dieter <rdieter@fedoraproject.org>2013-03-18 20:37:33 (GMT)
committerBrad King <brad.king@kitware.com>2013-03-18 20:37:50 (GMT)
commitdbd895b897602c4feb31b5465c64f8f474bddc07 (patch)
tree072edb2a0c599ca1b913de9ea512ede5ba638ab1 /Modules/FindImageMagick.cmake
parent5fe9855624c1a998eb57a1123a5b358646f3914b (diff)
downloadCMake-dbd895b897602c4feb31b5465c64f8f474bddc07.zip
CMake-dbd895b897602c4feb31b5465c64f8f474bddc07.tar.gz
CMake-dbd895b897602c4feb31b5465c64f8f474bddc07.tar.bz2
FindImageMagick: Search versioned suffixes (#14012)
The parent commit added suffixes for -Q8 and -Q16 but there may also be versioned suffixes -6.Q8 and -6.Q16.
Diffstat (limited to 'Modules/FindImageMagick.cmake')
-rw-r--r--Modules/FindImageMagick.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index 4aaefb7..cd97b38 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -147,17 +147,17 @@ foreach(component ${ImageMagick_FIND_COMPONENTS}
)
if(component STREQUAL "Magick++")
FIND_IMAGEMAGICK_API(Magick++ Magick++.h
- Magick++ CORE_RL_Magick++_ Magick++-Q16 Magick++-Q8
+ Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8
)
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
elseif(component STREQUAL "MagickWand")
FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
- Wand MagickWand CORE_RL_wand_ MagickWand-Q16 MagickWand-Q8
+ Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8
)
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
elseif(component STREQUAL "MagickCore")
FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
- Magick MagickCore CORE_RL_magick_ MagickCore-Q16 MagickCore-Q8
+ Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8
)
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
else()