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.
26 lines
896 B
26 lines
896 B
From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
|
|
Date: Mon, 11 Nov 2024 15:24:01 +0100
|
|
Subject: Fix ImageMagick_*_ARCH_INCLUDE_DIR detection
|
|
|
|
Bug-Debian: https://bugs.debian.org/1087233
|
|
Forwarded: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9990
|
|
---
|
|
Modules/FindImageMagick.cmake | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
|
|
index 66e65ad..809fec7 100644
|
|
--- a/Modules/FindImageMagick.cmake
|
|
+++ b/Modules/FindImageMagick.cmake
|
|
@@ -133,7 +133,9 @@ function(FIND_IMAGEMAGICK_API component header)
|
|
NO_DEFAULT_PATH
|
|
)
|
|
find_path(ImageMagick_${component}_ARCH_INCLUDE_DIR
|
|
- NAMES magick/magick-baseconfig.h
|
|
+ NAMES
|
|
+ magick/magick-baseconfig.h
|
|
+ MagickCore/magick-baseconfig.h
|
|
HINTS
|
|
${PC_${component}_INCLUDEDIR}
|
|
${PC_${component}_INCLUDE_DIRS}
|