--- /tmp/FindImageMagick.cmake 2014-07-22 20:14:00.000000000 +0200 +++ /usr/share/cmake-2.8/Modules/FindImageMagick.cmake 2014-07-22 22:24:15.542298783 +0200 @@ -79,7 +79,7 @@ pkg_check_modules(PC_${component} QUIET ${component}) - find_path(ImageMagick_${component}_INCLUDE_DIR + find_path(ImageMagick_${component}_INDEP_INCLUDE_DIR NAMES ${header} HINTS ${PC_${component}_INCLUDEDIR} @@ -89,7 +89,19 @@ "[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 indep 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 include dir." ) find_library(ImageMagick_${component}_LIBRARY NAMES ${ARGN} @@ -101,12 +113,25 @@ DOC "Path to the ImageMagick Magick++ library." ) - if(ImageMagick_${component}_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY) + # old version have only indep dir + if(ImageMagick_${component}_INDEP_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY) set(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE) + if(ImageMagick_${component}_ARCH_INCLUDE_DIR) + list(APPEND ImageMagick_${component}_INCLUDE_DIRS + ${ImageMagick_${component}_INDEP_INCLUDE_DIR} + ${ImageMagick_${component}_ARCH_INCLUDE_DIR}) + else() + list(APPEND ImageMagick_${component}_INCLUDE_DIRS + ${ImageMagick_${component}_INDEP_INCLUDE_DIR}) + endif() + list(REMOVE_DUPLICATES ImageMagick_${component}_INCLUDE_DIRS) + set(ImageMagick_${component}_INCLUDE_DIRS ${ImageMagick_${component}_INCLUDE_DIRS} + CACHE PATH "Path to the ImageMagick include dir") + list(APPEND ImageMagick_INCLUDE_DIRS - ${ImageMagick_${component}_INCLUDE_DIR} - ) + ${ImageMagick_${component}_INCLUDE_DIRS} + ) list(REMOVE_DUPLICATES ImageMagick_INCLUDE_DIRS) set(ImageMagick_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS} PARENT_SCOPE)