mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-28 18:09:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

FindImageMagick: Find components in same locations as main package

Browse Source 
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.
This commit is contained in:
Roman Wüger
2018-04-03 14:07:34 +02:00
committed by Brad King
parent e3ce4d7a28
commit 68d1fc89ed
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/FindImageMagick.cmake
+3
View File
@@ -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)
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)
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