From 1342e0222fed06f748f266a3a4e82c907cb76726 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 23 Jul 2014 15:33:48 -0400 Subject: [PATCH] FindImageMagick: Provide per-component include dirs (#15007) Set the ImageMagick__INCLUDE_DIRS variable that is mentioned in the documentation but was not set before. --- Modules/FindImageMagick.cmake | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake index 33f95ce..65458b7 100644 --- a/Modules/FindImageMagick.cmake +++ b/Modules/FindImageMagick.cmake @@ -143,13 +143,20 @@ function(FIND_IMAGEMAGICK_API component header) if(ImageMagick_${component}_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY) set(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE) - list(APPEND ImageMagick_INCLUDE_DIRS + # Construct per-component include directories. + set(ImageMagick_${component}_INCLUDE_DIRS ${ImageMagick_${component}_INCLUDE_DIR} ) if(ImageMagick_${component}_ARCH_INCLUDE_DIR) - list(APPEND ImageMagick_INCLUDE_DIRS + list(APPEND ImageMagick_${component}_INCLUDE_DIRS ${ImageMagick_${component}_ARCH_INCLUDE_DIR}) endif() + list(REMOVE_DUPLICATES ImageMagick_${component}_INCLUDE_DIRS) + set(ImageMagick_${component}_INCLUDE_DIRS + ${ImageMagick_${component}_INCLUDE_DIRS} PARENT_SCOPE) + + # Add the per-component include directories to the full include dirs. + list(APPEND ImageMagick_INCLUDE_DIRS ${ImageMagick_${component}_INCLUDE_DIRS}) list(REMOVE_DUPLICATES ImageMagick_INCLUDE_DIRS) set(ImageMagick_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS} PARENT_SCOPE) -- 1.7.10.4