diff options
| author | Brad King <brad.king@kitware.com> | 2018-02-13 16:08:32 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-02-13 16:08:38 (GMT) |
| commit | 210a80f48dd1268c424df137ad08a916147cdd97 (patch) | |
| tree | 50fa28175802444fdeca423677815713f4d9b260 | |
| parent | ab8416776de32e6b6225743721315b8dcbd2d01e (diff) | |
| parent | 917852396866933f35cd723318f42290753873ff (diff) | |
| download | CMake-210a80f48dd1268c424df137ad08a916147cdd97.zip CMake-210a80f48dd1268c424df137ad08a916147cdd97.tar.gz CMake-210a80f48dd1268c424df137ad08a916147cdd97.tar.bz2 | |
Merge topic 'FindImageMagick-FixFor7.0.x'
91785239 FindImageMagick: Add 7.0 library names
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1754
| -rw-r--r-- | Modules/FindImageMagick.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake index c16bbf2..881bff1 100644 --- a/Modules/FindImageMagick.cmake +++ b/Modules/FindImageMagick.cmake @@ -206,7 +206,7 @@ foreach(component ${ImageMagick_FIND_COMPONENTS} list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY) elseif(component STREQUAL "MagickWand") FIND_IMAGEMAGICK_API(MagickWand "wand/MagickWand.h;MagickWand/MagickWand.h" - Wand MagickWand CORE_RL_wand_ + Wand MagickWand CORE_RL_wand_ CORE_RL_MagickWand_ MagickWand-6 MagickWand-7 MagickWand-Q16 MagickWand-Q8 MagickWand-Q16HDRI MagickWand-Q8HDRI MagickWand-6.Q64 MagickWand-6.Q32 MagickWand-6.Q64HDRI MagickWand-6.Q32HDRI @@ -217,7 +217,7 @@ foreach(component ${ImageMagick_FIND_COMPONENTS} list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY) elseif(component STREQUAL "MagickCore") FIND_IMAGEMAGICK_API(MagickCore "magick/MagickCore.h;MagickCore/MagickCore.h" - Magick MagickCore CORE_RL_magick_ + Magick MagickCore CORE_RL_magick_ CORE_RL_MagickCore_ MagickCore-6 MagickCore-7 MagickCore-Q16 MagickCore-Q8 MagickCore-Q16HDRI MagickCore-Q8HDRI MagickCore-6.Q64 MagickCore-6.Q32 MagickCore-6.Q64HDRI MagickCore-6.Q32HDRI |