Commit 68d1fc89 authored by Roman's avatar Roman Committed by Brad King
Browse files

FindImageMagick: Find components in same locations as main package

Fix component include/library path if multiple versions are installed.
When searching for individual components, look only in the locations
we expect to find them that we already computed.
parent e3ce4d7a
...@@ -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