diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-12 15:26:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-04-12 15:26:43 (GMT) |
| commit | 580822fa67acb10ff6802248909ac602ef3eb1fe (patch) | |
| tree | 99c37487028d1a40b4b660670ed11b9b3702a960 /Modules | |
| parent | 3551aede357dfc34a64d580117d18fb3c37e8ff1 (diff) | |
| parent | 68d1fc89edf395464b301a725e6e865839b8337e (diff) | |
| download | CMake-580822fa67acb10ff6802248909ac602ef3eb1fe.zip CMake-580822fa67acb10ff6802248909ac602ef3eb1fe.tar.gz CMake-580822fa67acb10ff6802248909ac602ef3eb1fe.tar.bz2 | |
Merge topic 'FindImageMagick-FixForMultipleInstalls'
68d1fc89ed FindImageMagick: Find components in same locations as main package
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1917
Diffstat (limited to 'Modules')
| -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 |