You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
2.0 KiB
56 lines
2.0 KiB
11 years ago
|
From 6f5581c105d59ed00cc065b9ab9b3c8c0a441db3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: bastien ROUCARIES <roucaries.bastien@gmail.com>
|
||
|
|
Date: Tue, 22 Jul 2014 22:24:15 +0200
|
||
|
|
Subject: [PATCH] FindImageMagick: Find arch include dir (#15007)
|
||
|
|
|
||
|
|
---
|
||
|
|
Modules/FindImageMagick.cmake | 19 ++++++++++++++++++-
|
||
|
|
1 file changed, 18 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
|
||
|
|
index f6c8b3a..33f95ce 100644
|
||
|
|
--- a/Modules/FindImageMagick.cmake
|
||
|
|
+++ b/Modules/FindImageMagick.cmake
|
||
|
|
@@ -115,7 +115,19 @@ function(FIND_IMAGEMAGICK_API component header)
|
||
|
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
|
||
|
|
PATH_SUFFIXES
|
||
|
|
ImageMagick ImageMagick-6
|
||
|
|
- DOC "Path to the ImageMagick include dir."
|
||
|
|
+ DOC "Path to the ImageMagick arch-independent include dir."
|
||
|
|
+ )
|
||
|
|
+ find_path(ImageMagick_${component}_ARCH_INCLUDE_DIR
|
||
|
|
+ NAMES magick/magick-baseconfig.h
|
||
|
|
+ HINTS
|
||
|
|
+ ${PC_${component}_INCLUDEDIR}
|
||
|
|
+ ${PC_${component}_INCLUDE_DIRS}
|
||
|
|
+ PATHS
|
||
|
|
+ ${ImageMagick_INCLUDE_DIRS}
|
||
|
|
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
|
||
|
|
+ PATH_SUFFIXES
|
||
|
|
+ ImageMagick ImageMagick-6
|
||
|
|
+ DOC "Path to the ImageMagick arch-specific include dir."
|
||
|
|
)
|
||
|
|
find_library(ImageMagick_${component}_LIBRARY
|
||
|
|
NAMES ${ARGN}
|
||
|
|
@@ -127,12 +139,17 @@ function(FIND_IMAGEMAGICK_API component header)
|
||
|
|
DOC "Path to the ImageMagick Magick++ library."
|
||
|
|
)
|
||
|
|
|
||
|
|
+ # old version have only indep dir
|
||
|
|
if(ImageMagick_${component}_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY)
|
||
|
|
set(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE)
|
||
|
|
|
||
|
|
list(APPEND ImageMagick_INCLUDE_DIRS
|
||
|
|
${ImageMagick_${component}_INCLUDE_DIR}
|
||
|
|
)
|
||
|
|
+ if(ImageMagick_${component}_ARCH_INCLUDE_DIR)
|
||
|
|
+ list(APPEND ImageMagick_INCLUDE_DIRS
|
||
|
|
+ ${ImageMagick_${component}_ARCH_INCLUDE_DIR})
|
||
|
|
+ endif()
|
||
|
|
list(REMOVE_DUPLICATES ImageMagick_INCLUDE_DIRS)
|
||
|
|
set(ImageMagick_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS} PARENT_SCOPE)
|
||
|
|
|
||
|
|
--
|
||
|
|
1.7.10.4
|
||
|
|
|