Commit 580822fa authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'FindImageMagick-FixForMultipleInstalls'

68d1fc89

 FindImageMagick: Find components in same locations as main package
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1917
parents 3551aede 68d1fc89
Pipeline #98398 passed with stage
in 0 seconds
...@@ -104,6 +104,7 @@ function(FIND_IMAGEMAGICK_API component header) ...@@ -104,6 +104,7 @@ function(FIND_IMAGEMAGICK_API component header)
PATH_SUFFIXES PATH_SUFFIXES
ImageMagick ImageMagick-6 ImageMagick-7 ImageMagick ImageMagick-6 ImageMagick-7
DOC "Path to the ImageMagick arch-independent include dir." DOC "Path to the ImageMagick arch-independent include dir."
NO_DEFAULT_PATH
) )
find_path(ImageMagick_${component}_ARCH_INCLUDE_DIR find_path(ImageMagick_${component}_ARCH_INCLUDE_DIR
NAMES magick/magick-baseconfig.h NAMES magick/magick-baseconfig.h
...@@ -116,6 +117,7 @@ function(FIND_IMAGEMAGICK_API component header) ...@@ -116,6 +117,7 @@ function(FIND_IMAGEMAGICK_API component header)
PATH_SUFFIXES PATH_SUFFIXES
ImageMagick ImageMagick-6 ImageMagick-7 ImageMagick ImageMagick-6 ImageMagick-7
DOC "Path to the ImageMagick arch-specific include dir." DOC "Path to the ImageMagick arch-specific include dir."
NO_DEFAULT_PATH
) )
find_library(ImageMagick_${component}_LIBRARY find_library(ImageMagick_${component}_LIBRARY
NAMES ${ARGN} NAMES ${ARGN}
...@@ -125,6 +127,7 @@ function(FIND_IMAGEMAGICK_API component header) ...@@ -125,6 +127,7 @@ function(FIND_IMAGEMAGICK_API component header)
PATHS PATHS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/lib"
DOC "Path to the ImageMagick Magick++ library." DOC "Path to the ImageMagick Magick++ library."
NO_DEFAULT_PATH
) )
# old version have only indep dir # old version have only indep dir
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment