[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2576-ge4ee856

[Brad King]

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  e4ee8560d45693f503cb18f4c7eb91482a0ab14a (commit)
       via  dbd895b897602c4feb31b5465c64f8f474bddc07 (commit)
      from  65e7d1a891015a90ce057cb5c37b2bac3e3bc83a (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=e4ee8560d45693f503cb18f4c7eb91482a0ab14a
commit e4ee8560d45693f503cb18f4c7eb91482a0ab14a
Merge: 65e7d1a dbd895b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 18 16:40:39 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 18 16:40:39 2013 -0400

    Merge topic 'FindImageMagick-v6.8.0-8' into next
    
    dbd895b FindImageMagick: Search versioned suffixes (#14012)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dbd895b897602c4feb31b5465c64f8f474bddc07
commit dbd895b897602c4feb31b5465c64f8f474bddc07
Author:     Rex Dieter <rdieter at fedoraproject.org>
AuthorDate: Mon Mar 18 16:37:33 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 18 16:37:50 2013 -0400

    FindImageMagick: Search versioned suffixes (#14012)
    
    The parent commit added suffixes for -Q8 and -Q16 but there may also be
    versioned suffixes -6.Q8 and -6.Q16.

diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index 4aaefb7..cd97b38 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++-Q16 Magick++-Q8
+      Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 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_ MagickWand-Q16 MagickWand-Q8
+      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 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_ MagickCore-Q16 MagickCore-Q8
+      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 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