diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-23 19:33:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-07-23 19:33:48 (GMT) |
| commit | 1342e0222fed06f748f266a3a4e82c907cb76726 (patch) | |
| tree | c617879bc2aae21b2e9070327a56dc5fd019c46d /Modules/FindImageMagick.cmake | |
| parent | 6f5581c105d59ed00cc065b9ab9b3c8c0a441db3 (diff) | |
| download | CMake-1342e0222fed06f748f266a3a4e82c907cb76726.zip CMake-1342e0222fed06f748f266a3a4e82c907cb76726.tar.gz CMake-1342e0222fed06f748f266a3a4e82c907cb76726.tar.bz2 | |
FindImageMagick: Provide per-component include dirs (#15007)
Set the ImageMagick_<component>_INCLUDE_DIRS variable that is mentioned
in the documentation but was not set before.
Diffstat (limited to 'Modules/FindImageMagick.cmake')
| -rw-r--r-- | Modules/FindImageMagick.cmake | 11 |
1 files 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) |