diff options
| author | bastien ROUCARIES <roucaries.bastien@gmail.com> | 2014-07-22 20:24:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-07-23 13:44:55 (GMT) |
| commit | 6f5581c105d59ed00cc065b9ab9b3c8c0a441db3 (patch) | |
| tree | 34762f7100c6cf1919d0f18c12609eb9880f953b /Modules/FindImageMagick.cmake | |
| parent | 5c38fc1628b66ed405d66848e64f17834079d846 (diff) | |
| download | CMake-6f5581c105d59ed00cc065b9ab9b3c8c0a441db3.zip CMake-6f5581c105d59ed00cc065b9ab9b3c8c0a441db3.tar.gz CMake-6f5581c105d59ed00cc065b9ab9b3c8c0a441db3.tar.bz2 | |
FindImageMagick: Find arch include dir (#15007)
Diffstat (limited to 'Modules/FindImageMagick.cmake')
| -rw-r--r-- | Modules/FindImageMagick.cmake | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake index f6c8b3a..33f95ce 100644 --- a/Modules/FindImageMagick.cmake +++ b/Modules/FindImageMagick.cmake @@ -115,7 +115,19 @@ function(FIND_IMAGEMAGICK_API component header) "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" PATH_SUFFIXES ImageMagick ImageMagick-6 - DOC "Path to the ImageMagick include dir." + DOC "Path to the ImageMagick arch-independent include dir." + ) + find_path(ImageMagick_${component}_ARCH_INCLUDE_DIR + NAMES magick/magick-baseconfig.h + HINTS + ${PC_${component}_INCLUDEDIR} + ${PC_${component}_INCLUDE_DIRS} + PATHS + ${ImageMagick_INCLUDE_DIRS} + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" + PATH_SUFFIXES + ImageMagick ImageMagick-6 + DOC "Path to the ImageMagick arch-specific include dir." ) find_library(ImageMagick_${component}_LIBRARY NAMES ${ARGN} @@ -127,12 +139,17 @@ function(FIND_IMAGEMAGICK_API component header) DOC "Path to the ImageMagick Magick++ library." ) + # old version have only indep dir 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} ) + if(ImageMagick_${component}_ARCH_INCLUDE_DIR) + list(APPEND ImageMagick_INCLUDE_DIRS + ${ImageMagick_${component}_ARCH_INCLUDE_DIR}) + endif() list(REMOVE_DUPLICATES ImageMagick_INCLUDE_DIRS) set(ImageMagick_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS} PARENT_SCOPE) |