diff options
| author | Roman Wüger <roman.wueger@gmx.at> | 2018-04-03 12:07:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-04-11 15:32:09 (GMT) |
| commit | 68d1fc89edf395464b301a725e6e865839b8337e (patch) | |
| tree | ce74ba2442289e6286ec05ef7a6e726d093ccc41 /Modules/FindImageMagick.cmake | |
| parent | e3ce4d7a282ba75a4d34aefb0176535bdbe55c36 (diff) | |
| download | CMake-68d1fc89edf395464b301a725e6e865839b8337e.zip CMake-68d1fc89edf395464b301a725e6e865839b8337e.tar.gz CMake-68d1fc89edf395464b301a725e6e865839b8337e.tar.bz2 | |
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.
Diffstat (limited to 'Modules/FindImageMagick.cmake')
| -rw-r--r-- | Modules/FindImageMagick.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake index 881bff1..6d94d3b 100644 --- a/Modules/FindImageMagick.cmake +++ b/Modules/FindImageMagick.cmake @@ -104,6 +104,7 @@ function(FIND_IMAGEMAGICK_API component header) PATH_SUFFIXES ImageMagick ImageMagick-6 ImageMagick-7 DOC "Path to the ImageMagick arch-independent include dir." + NO_DEFAULT_PATH ) find_path(ImageMagick_${component}_ARCH_INCLUDE_DIR NAMES magick/magick-baseconfig.h @@ -116,6 +117,7 @@ function(FIND_IMAGEMAGICK_API component header) PATH_SUFFIXES ImageMagick ImageMagick-6 ImageMagick-7 DOC "Path to the ImageMagick arch-specific include dir." + NO_DEFAULT_PATH ) find_library(ImageMagick_${component}_LIBRARY NAMES ${ARGN} @@ -125,6 +127,7 @@ function(FIND_IMAGEMAGICK_API component header) PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/lib" DOC "Path to the ImageMagick Magick++ library." + NO_DEFAULT_PATH ) # old version have only indep dir |