projects / packages / cmake.git / blame
| Commit | Line | Data |
|---|---|---|
| 53357b6b AM |
1 | commit 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a |
| 2 | Author: Funda Wang <fundawang@gmail.com> | |
| 3 | Date: Tue May 28 06:17:49 2013 +0000 | |
| 4 | ||
| 5 | FindImageMagick: Find v6 include dir (#14174) | |
| 6 | ||
| 7 | The header files of ImageMagick are now located at | |
| 8 | <prefix>/include/ImageMagick-6 instead of <prefix>/include/ImageMagick. | |
| 9 | ||
| 10 | diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake | |
| 11 | index cd97b38..02a5777 100644 | |
| 12 | --- a/Modules/FindImageMagick.cmake | |
| 13 | +++ b/Modules/FindImageMagick.cmake | |
| 14 | @@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header) | |
| 15 | ${ImageMagick_INCLUDE_DIRS} | |
| 16 | "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" | |
| 17 | PATH_SUFFIXES | |
| 18 | - ImageMagick | |
| 19 | + ImageMagick ImageMagick-6 | |
| 20 | DOC "Path to the ImageMagick include dir." | |
| 21 | ) | |
| 22 | find_library(ImageMagick_${component}_LIBRARY |