dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-04 14:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

FindImageMagick: Fix detection of version 7 from headers

Browse Source
This commit is contained in:
Brad King
2025-11-11 19:23:57 -05:00
parent faf8addc71
commit a0642acbce
3 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/FindImageMagick.cmake
View File

@@ -298,8 +298,9 @@ function(_ImageMagick_GetVersion)
) )
foreach(dir IN LISTS ImageMagick_INCLUDE_DIRS) foreach(dir IN LISTS ImageMagick_INCLUDE_DIRS)
if(EXISTS ${dir}/magick/version.h) foreach(subdir IN ITEMS MagickCore magick)
file(STRINGS "${dir}/magick/version.h" results REGEX "${regex}") if(EXISTS ${dir}/${subdir}/version.h)
file(STRINGS "${dir}/${subdir}/version.h" results REGEX "${regex}")
foreach(line ${results}) foreach(line ${results})
if(line MATCHES "${regex}") if(line MATCHES "${regex}")
@@ -320,6 +321,11 @@ function(_ImageMagick_GetVersion)
break() break()
endif() endif()
endforeach() endforeach()
if(DEFINED version)
break()
endif()
endforeach()
endif() endif()
if(DEFINED version) if(DEFINED version)

3
Tests/FindImageMagick/Test/CMakeLists.txt
View File

@@ -14,4 +14,7 @@ add_test(NAME test_magick++ COMMAND test_magick++)
add_executable(test_magick_wand main_magick_wand.c) add_executable(test_magick_wand main_magick_wand.c)
target_link_libraries(test_magick_wand ImageMagick::MagickWand) target_link_libraries(test_magick_wand ImageMagick::MagickWand)
if(ImageMagick_VERSION VERSION_GREATER_EQUAL 7)
target_compile_definitions(test_magick_wand PRIVATE TEST_IMAGE_MAGICK_7)
endif()
add_test(NAME test_magick_wand COMMAND test_magick_wand) add_test(NAME test_magick_wand COMMAND test_magick_wand)

4
Tests/FindImageMagick/Test/main_magick_wand.c
View File

@@ -1,4 +1,8 @@
#ifdef TEST_IMAGE_MAGICK_7
# include <MagickWand/MagickWand.h>
#else
# include <wand/MagickWand.h> # include <wand/MagickWand.h>
#endif
int main(void) int main(void)
{ {