diff options
| author | Brad King <brad.king@kitware.com> | 2013-03-19 19:20:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-03-19 19:20:34 (GMT) |
| commit | 36f158159bb83ff17fb11f0b3b2554318ed1a9cd (patch) | |
| tree | 4fb74083d79e7614575e4361aeb88f030716802b | |
| parent | b04b8ddfd8c6203c15ec6bf411da49817dec4800 (diff) | |
| parent | dbd895b897602c4feb31b5465c64f8f474bddc07 (diff) | |
| download | CMake-36f158159bb83ff17fb11f0b3b2554318ed1a9cd.zip CMake-36f158159bb83ff17fb11f0b3b2554318ed1a9cd.tar.gz CMake-36f158159bb83ff17fb11f0b3b2554318ed1a9cd.tar.bz2 | |
Merge topic 'FindImageMagick-v6.8.0-8'
dbd895b FindImageMagick: Search versioned suffixes (#14012)
| -rw-r--r-- | Modules/FindImageMagick.cmake | 6 |
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() |