Index: cmake-2.8.12.1/Modules/FindImageMagick.cmake
===================================================================
--- cmake-2.8.12.1.orig/Modules/FindImageMagick.cmake
+++ cmake-2.8.12.1/Modules/FindImageMagick.cmake
@@ -43,6 +43,7 @@
 #  ImageMagick_<component>_FOUND        - TRUE if <component> is found.
 #  ImageMagick_<component>_INCLUDE_DIRS - Full path to <component> include dirs.
 #  ImageMagick_<component>_LIBRARIES    - Full path to <component> libraries.
+#  ImageMagick_<component>_CFLAGS       - CFLAGS for <component>.
 #
 # Example Usages:
 #  find_package(ImageMagick)
@@ -69,41 +70,53 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
+
 #---------------------------------------------------------------------
 # Helper functions
 #---------------------------------------------------------------------
 function(FIND_IMAGEMAGICK_API component header)
   set(ImageMagick_${component}_FOUND FALSE PARENT_SCOPE)
-
-  find_path(ImageMagick_${component}_INCLUDE_DIR
-    NAMES ${header}
-    PATHS
+  find_package(PkgConfig)
+  if(PKG_CONFIG_FOUND)
+    pkg_search_module(ImageMagick_pkgconfig ${component})
+    if(ImageMagick_pkgconfig_${component}_FOUND)
+      set(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE)
+      set(ImageMagick_${component}_INCLUDE_DIR ${ImageMagick_pkgconfig_INCLUDE_DIRS} PARENT_SCOPE)
+      set(ImageMagick_${component}_LIBRARY ${ImageMagick_pkgconfig_LDFLAGS} PARENT_SCOPE)
+      set(ImageMagick_${component}_CFLAGS ${ImageMagick_pkgconfig_CLFAGS} PARENT_SCOPE)
+    endif()
+  else()
+    find_path(ImageMagick_${component}_INCLUDE_DIR
+      NAMES ${header}
+      PATHS
       ${ImageMagick_INCLUDE_DIRS}
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
-    PATH_SUFFIXES
+      PATH_SUFFIXES
       ImageMagick ImageMagick-6
-    DOC "Path to the ImageMagick include dir."
-    )
-  find_library(ImageMagick_${component}_LIBRARY
-    NAMES ${ARGN}
-    PATHS
+      DOC "Path to the ImageMagick include dir."
+      )
+    find_library(ImageMagick_${component}_LIBRARY
+      NAMES ${ARGN}
+      PATHS
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/lib"
-    DOC "Path to the ImageMagick Magick++ library."
-    )
-
-  if(ImageMagick_${component}_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY)
-    set(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE)
-
-    list(APPEND ImageMagick_INCLUDE_DIRS
-      ${ImageMagick_${component}_INCLUDE_DIR}
+      DOC "Path to the ImageMagick Magick++ library."
       )
-    list(REMOVE_DUPLICATES ImageMagick_INCLUDE_DIRS)
-    set(ImageMagick_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS} PARENT_SCOPE)
 
-    list(APPEND ImageMagick_LIBRARIES
-      ${ImageMagick_${component}_LIBRARY}
-      )
-    set(ImageMagick_LIBRARIES ${ImageMagick_LIBRARIES} PARENT_SCOPE)
+    if(ImageMagick_${component}_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY)
+      set(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE)
+
+      list(APPEND ImageMagick_INCLUDE_DIRS
+	${ImageMagick_${component}_INCLUDE_DIR}
+	)
+      list(REMOVE_DUPLICATES ImageMagick_INCLUDE_DIRS)
+      set(ImageMagick_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS} PARENT_SCOPE)
+
+      list(APPEND ImageMagick_LIBRARIES
+	${ImageMagick_${component}_LIBRARY}
+	)
+      set(ImageMagick_LIBRARIES ${ImageMagick_LIBRARIES} PARENT_SCOPE)
+    endif()
+     set(ImageMagick_${component}_CFLAGS "" PARENT_SCOPE)
   endif()
 endfunction()