44 lines
2.0 KiB
Diff
44 lines
2.0 KiB
Diff
|
--- cmake-2.8.11.2/Modules/FindImageMagick.cmake.orig 2013-07-02 15:41:39.000000000 +0200
|
||
|
|
+++ cmake-2.8.11.2/Modules/FindImageMagick.cmake 2013-08-26 13:49:15.004586070 +0200
|
||
|
|
@@ -80,6 +80,9 @@
|
||
|
|
PATHS
|
||
|
|
${ImageMagick_INCLUDE_DIRS}
|
||
|
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
|
||
|
|
+ HINTS
|
||
|
|
+ ${PC_${component}_INCLUDEDIR}
|
||
|
|
+ ${PC_${component}_INCLUDE_DIRS}
|
||
|
|
PATH_SUFFIXES
|
||
|
|
ImageMagick
|
||
|
|
DOC "Path to the ImageMagick include dir."
|
||
|
|
@@ -88,6 +91,9 @@
|
||
|
|
NAMES ${ARGN}
|
||
|
|
PATHS
|
||
|
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/lib"
|
||
|
|
+ HINTS
|
||
|
|
+ ${PC_${component}_LIBDIR}
|
||
|
|
+ ${PC_${component}_LIB_DIRS}
|
||
|
|
DOC "Path to the ImageMagick Magick++ library."
|
||
|
|
)
|
||
|
|
|
||
|
|
@@ -147,17 +153,17 @@
|
||
|
|
)
|
||
|
|
if(component STREQUAL "Magick++")
|
||
|
|
FIND_IMAGEMAGICK_API(Magick++ Magick++.h
|
||
|
|
- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8
|
||
|
|
+ Magick++ CORE_RL_Magick++_ Magick++-6.Q16HDRI Magick++-6.Q16 Magick++-Q16HDRI 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-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8
|
||
|
|
+ Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16HDRI MagickWand-6.Q16 MagickWand-Q16HDRI 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-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8
|
||
|
|
+ Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16HDRI MagickCore-6.Q16 MagickCore-Q16HDRI MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8
|
||
|
|
)
|
||
|
|
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
|
||
|
|
else()
|