diff options
author | root <root@rshg054.dnsready.net> | 2013-06-04 00:27:56 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-06-04 00:27:56 -0700 |
commit | cc57cb201ddb179d2bb481c13dd4f286ae643b12 (patch) | |
tree | 7932470d6b8a193c032f1012a7996cc78ea52201 /extra/cmake/imagemagick.patch | |
parent | 1f86bf1b08cb980cea57c1d4d3187e2251f5a63b (diff) |
Tue Jun 4 00:27:56 PDT 2013
Diffstat (limited to 'extra/cmake/imagemagick.patch')
-rw-r--r-- | extra/cmake/imagemagick.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/extra/cmake/imagemagick.patch b/extra/cmake/imagemagick.patch new file mode 100644 index 000000000..8e5279030 --- /dev/null +++ b/extra/cmake/imagemagick.patch @@ -0,0 +1,27 @@ +From 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a Mon Sep 17 00:00:00 2001 +From: Funda Wang <fundawang@gmail.com> +Date: Tue, 28 May 2013 06:17:49 +0000 +Subject: [PATCH] FindImageMagick: Find v6 include dir (#14174) + +The header files of ImageMagick are now located at +<prefix>/include/ImageMagick-6 instead of <prefix>/include/ImageMagick. +--- + Modules/FindImageMagick.cmake | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake +index cd97b38..02a5777 100644 +--- a/Modules/FindImageMagick.cmake ++++ b/Modules/FindImageMagick.cmake +@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header) + ${ImageMagick_INCLUDE_DIRS} + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" + PATH_SUFFIXES +- ImageMagick ++ ImageMagick ImageMagick-6 + DOC "Path to the ImageMagick include dir." + ) + find_library(ImageMagick_${component}_LIBRARY +-- +1.7.0 + |