From 4267e83cd2c8c292ab3af6378575ae750bb32e86 Mon Sep 17 00:00:00 2001 From: Mike Stroyan Date: Tue, 20 Sep 2016 09:05:28 -0600 Subject: build: UNSET cache variables for FIND_IMAGEMAGICK_API The way that the ImageMagick component search calls find_path multiple times with the same variable but different names does not expect old cache values in the variable. --- cmake/FindImageMagick.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/FindImageMagick.cmake b/cmake/FindImageMagick.cmake index 163e5ae8..4db4773b 100644 --- a/cmake/FindImageMagick.cmake +++ b/cmake/FindImageMagick.cmake @@ -231,6 +231,8 @@ FOREACH(component ${ImageMagick_FIND_COMPONENTS} ) IF(component STREQUAL "Magick++") + # unset cached variable that assumes header parameter never changes + UNSET(ImageMagick_MagickWand_INCLUDE_DIR CACHE) # Try top folder first FIND_IMAGEMAGICK_API(Magick++ Magick++.h @@ -252,6 +254,8 @@ FOREACH(component ${ImageMagick_FIND_COMPONENTS} ENDIF() ELSEIF(component STREQUAL "MagickWand") + # unset cached variable that assumes header parameter never changes + UNSET(ImageMagick_MagickWand_INCLUDE_DIR CACHE) # Try top folder first FIND_IMAGEMAGICK_API(MagickWand MagickWand.h -- cgit v1.2.3