This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 721b0e5fb9a2c944b4fd9c95d6cb7f87b253fe2c (commit)
via 5fe9855624c1a998eb57a1123a5b358646f3914b (commit)
from 8965cf74cd40213721aa797f704ea6872ef15958 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=721b0e5fb9a2c944b4fd9c95d6cb7f87b253fe2c
commit 721b0e5fb9a2c944b4fd9c95d6cb7f87b253fe2c
Merge: 8965cf7 5fe9855
Author: Brad King <[email protected]>
AuthorDate: Tue Mar 5 11:32:11 2013 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Tue Mar 5 11:32:11 2013 -0500
Merge topic 'FindImageMagick-v6.8.0-8' into next
5fe9855 FindImageMagick: Search quantum depth suffixes (#13859)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fe9855624c1a998eb57a1123a5b358646f3914b
commit 5fe9855624c1a998eb57a1123a5b358646f3914b
Author: Slava Sysoltsev <[email protected]>
AuthorDate: Fri Mar 1 08:02:22 2013 -0500
Commit: Brad King <[email protected]>
CommitDate: Fri Mar 1 08:09:28 2013 -0500
FindImageMagick: Search quantum depth suffixes (#13859)
From ImageMagick's 6.8.0-8 changelog:
http://www.imagemagick.org/script/changelog.php
ABI is incompatible if quantum depth change.
Add abi indication to library name.
Search for library names with -Q16 and -Q8 suffixes.
Reported-by: Evangelos Foutras <[email protected]>
diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index bf09616..4aaefb7 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -147,17 +147,17 @@ foreach(component ${ImageMagick_FIND_COMPONENTS}
)
if(component STREQUAL "Magick++")
FIND_IMAGEMAGICK_API(Magick++ Magick++.h
- Magick++ CORE_RL_Magick++_
+ Magick++ CORE_RL_Magick++_ Magick++-Q16 Magick++-Q8
)
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
elseif(component STREQUAL "MagickWand")
FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
- Wand MagickWand CORE_RL_wand_
+ Wand MagickWand CORE_RL_wand_ MagickWand-Q16 MagickWand-Q8
)
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
elseif(component STREQUAL "MagickCore")
FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
- Magick MagickCore CORE_RL_magick_
+ Magick MagickCore CORE_RL_magick_ MagickCore-Q16 MagickCore-Q8
)
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
else()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindImageMagick.cmake | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
