[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3846-g12e18fa

[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  12e18fa0e1ec3917780f7b1d4a1c445bdbe65ecc (commit)
       via  5803b94a8b11b89d81f5492891430e2d55723346 (commit)
      from  b2c89f0fa31a62bbe7d9a0b66ba9163060dd56be (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=12e18fa0e1ec3917780f7b1d4a1c445bdbe65ecc
commit 12e18fa0e1ec3917780f7b1d4a1c445bdbe65ecc
Merge: b2c89f0 5803b94
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 13 09:28:52 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 13 09:28:52 2013 -0400

    Merge topic 'FindImageMagick-hdri' into next
    
    5803b94 FindImageMagick: Find libraries named with HDRI support (#14348)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5803b94a8b11b89d81f5492891430e2d55723346
commit 5803b94a8b11b89d81f5492891430e2d55723346
Author:     Eric Bélanger <snowmaniscool at gmail.com>
AuthorDate: Fri Aug 9 15:45:00 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 13 09:26:28 2013 -0400

    FindImageMagick: Find libraries named with HDRI support (#14348)
    
    When ImageMagick is built with HDRI support, the library names get a
    HDRI suffix.

diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index 02a5777..7c6cce7 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++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8
+      Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
       )
     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-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8
+      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI
       )
     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-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8
+      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI
       )
     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