48 lines
2.4 KiB
Diff
48 lines
2.4 KiB
Diff
|
From f51ccd38ed85e5799b2f0a88829eb6a40574ab05 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lars Wendler <polynomial-c@gentoo.org>
|
||
|
|
Date: Fri, 9 Jun 2017 02:07:11 +0200
|
||
|
|
Subject: [PATCH] Find more variants of ImageMagick
|
||
|
|
|
||
|
|
---
|
||
|
|
Modules/FindImageMagick.cmake | 6 ++++++
|
||
|
|
1 file changed, 6 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
|
||
|
|
index 7d5534bc2..488d7e0bf 100644
|
||
|
|
--- a/Modules/FindImageMagick.cmake
|
||
|
|
+++ b/Modules/FindImageMagick.cmake
|
||
|
|
@@ -196,24 +196,30 @@ foreach(component ${ImageMagick_FIND_COMPONENTS}
|
||
|
|
if(component STREQUAL "Magick++")
|
||
|
|
FIND_IMAGEMAGICK_API(Magick++ Magick++.h
|
||
|
|
Magick++ CORE_RL_Magick++_
|
||
|
|
+ Magick++-6.Q64 Magick++-6.Q64HDRI Magick++-6.Q32 Magick++-6.Q32HDRI
|
||
|
|
Magick++-Q8 Magick++-Q16 Magick++-Q16HDRI Magick++-Q8HDRI
|
||
|
|
Magick++-6.Q16 Magick++-6.Q8 Magick++-6.Q16HDRI Magick++-6.Q8HDRI
|
||
|
|
+ Magick++-7.Q64 Magick++-7.Q64HDRI Magick++-7.Q32 Magick++-7.Q32HDRI
|
||
|
|
Magick++-7.Q16 Magick++-7.Q8 Magick++-7.Q16HDRI Magick++-7.Q8HDRI
|
||
|
|
)
|
||
|
|
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_
|
||
|
|
+ MagickWand-6.Q64 MagickWand-6.Q64HDRI MagickWand-6.Q32 MagickWand-6.Q32HDRI
|
||
|
|
MagickWand-Q16 MagickWand-Q8 MagickWand-Q16HDRI MagickWand-Q8HDRI
|
||
|
|
MagickWand-6.Q16 MagickWand-6.Q8 MagickWand-6.Q16HDRI MagickWand-6.Q8HDRI
|
||
|
|
+ MagickWand-7.Q64 MagickWand-7.Q64HDRI MagickWand-7.Q32 MagickWand-7.Q32HDRI
|
||
|
|
MagickWand-7.Q16 MagickWand-7.Q8 MagickWand-7.Q16HDRI MagickWand-7.Q8HDRI
|
||
|
|
)
|
||
|
|
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_
|
||
|
|
+ MagickCore-6.Q64 MagickCore-6.Q64HDRI MagickCore-6.Q32 MagickCore-6.Q32HDRI
|
||
|
|
MagickCore-Q16 MagickCore-Q8 MagickCore-Q16HDRI MagickCore-Q8HDRI
|
||
|
|
MagickCore-6.Q16 MagickCore-6.Q8 MagickCore-6.Q16HDRI MagickCore-6.Q8HDRI
|
||
|
|
+ MagickCore-7.Q64 MagickCore-7.Q64HDRI MagickCore-7.Q32 MagickCore-7.Q32HDRI
|
||
|
|
MagickCore-7.Q16 MagickCore-7.Q8 MagickCore-7.Q16HDRI MagickCore-7.Q8HDRI
|
||
|
|
)
|
||
|
|
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
|
||
|
|
--
|
||
|
|
2.13.1
|
||
|
|
|