File cmake-ImageMagick7.patch of Package cmake

Overview Repositories Revisions Requests Users Attributes Meta

File cmake-ImageMagick7.patch of Package cmake (Revision b9d54ef222476894c587ff3a863bcd25)

Currently displaying revision b9d54ef222476894c587ff3a863bcd25 , Show latest

Index: cmake-3.7.2/Modules/FindImageMagick.cmake
===================================================================
--- cmake-3.7.2.orig/Modules/FindImageMagick.cmake	2017-01-13 15:05:41.000000000 +0100
+++ cmake-3.7.2/Modules/FindImageMagick.cmake	2017-03-28 11:00:23.197144625 +0200
@@ -88,13 +88,13 @@ find_package(PkgConfig QUIET)
 #---------------------------------------------------------------------
 # Helper functions
 #---------------------------------------------------------------------
-function(FIND_IMAGEMAGICK_API component header)
+function(FIND_IMAGEMAGICK_API component header6 header7)
   set(ImageMagick_${component}_FOUND FALSE PARENT_SCOPE)
 
   pkg_check_modules(PC_${component} QUIET ${component})
 
   find_path(ImageMagick_${component}_INCLUDE_DIR
-    NAMES ${header}
+    NAMES ${header6} ${header7}
     HINTS
       ${PC_${component}_INCLUDEDIR}
       ${PC_${component}_INCLUDE_DIRS}
@@ -195,17 +195,17 @@ foreach(component ${ImageMagick_FIND_COM
     )
   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++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
+      Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-7.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-7.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-7.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-7.Q8HDRI Magick++-Q8HDRI
       )
     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 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI
+    FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h MagickWand/MagickWand.h
+      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-7.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-7.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-7.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-7.Q8HDRI MagickWand-Q8HDRI
       )
     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 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI
+    FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h MagickCore/MagickCore.h
+      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-7.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-7.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-7.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-7.Q8HDRI MagickCore-Q8HDRI
       )
     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
   else()

Places

File cmake-ImageMagick7.patch of Package cmake (Revision b9d54ef222476894c587ff3a863bcd25)

Places