[Cmake-commits] CMake branch, master, updated. v3.10.0-386-ge91e69c

[Kitware Robot]

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, master has been updated
       via  e91e69cfb5a9bdb1cad7a6442913c15af88ce5ad (commit)
       via  35b8a26be15e625bc087d9a8a8b8b15cebf033b4 (commit)
      from  9698eef88ad50d9d470a270c26d4f7023cddcd80 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e91e69cfb5a9bdb1cad7a6442913c15af88ce5ad
commit e91e69cfb5a9bdb1cad7a6442913c15af88ce5ad
Merge: 9698eef 35b8a26
Author:     Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Tue Nov 21 10:54:45 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Nov 21 05:54:50 2017 -0500

    Merge topic 'imagemagick-6-freebsd-names'
    
    35b8a26b FindImageMagick: Add more library names
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1505


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35b8a26be15e625bc087d9a8a8b8b15cebf033b4
commit 35b8a26be15e625bc087d9a8a8b8b15cebf033b4
Author:     Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Sun Nov 19 23:12:58 2017 +0100
Commit:     Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Mon Nov 20 14:44:54 2017 +0100

    FindImageMagick: Add more library names
    
    The port maintainers on FreeBSD normalize the library names to not
    include the bit and HDRI options.
    
    Furthermore, `--quantum-depth=32` and `--quantum-depth=64` will yield
    `Q32` and `Q64` suffixes in the library names.
    
    Issue: #17492

diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index 7d5534b..c16bbf2 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -196,24 +196,33 @@ foreach(component ${ImageMagick_FIND_COMPONENTS}
   if(component STREQUAL "Magick++")
     FIND_IMAGEMAGICK_API(Magick++ Magick++.h
       Magick++ CORE_RL_Magick++_
+      Magick++-6 Magick++-7
       Magick++-Q8 Magick++-Q16 Magick++-Q16HDRI Magick++-Q8HDRI
+      Magick++-6.Q64 Magick++-6.Q32 Magick++-6.Q64HDRI Magick++-6.Q32HDRI
       Magick++-6.Q16 Magick++-6.Q8 Magick++-6.Q16HDRI Magick++-6.Q8HDRI
+      Magick++-7.Q64 Magick++-7.Q32 Magick++-7.Q64HDRI Magick++-7.Q32HDRI
       Magick++-7.Q16 Magick++-7.Q8 Magick++-7.Q16HDRI Magick++-7.Q8HDRI
       )
     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
   elseif(component STREQUAL "MagickWand")
     FIND_IMAGEMAGICK_API(MagickWand "wand/MagickWand.h;MagickWand/MagickWand.h"
       Wand MagickWand CORE_RL_wand_
+      MagickWand-6 MagickWand-7
       MagickWand-Q16 MagickWand-Q8 MagickWand-Q16HDRI MagickWand-Q8HDRI
+      MagickWand-6.Q64 MagickWand-6.Q32 MagickWand-6.Q64HDRI MagickWand-6.Q32HDRI
       MagickWand-6.Q16 MagickWand-6.Q8 MagickWand-6.Q16HDRI MagickWand-6.Q8HDRI
+      MagickWand-7.Q64 MagickWand-7.Q32 MagickWand-7.Q64HDRI MagickWand-7.Q32HDRI
       MagickWand-7.Q16 MagickWand-7.Q8 MagickWand-7.Q16HDRI MagickWand-7.Q8HDRI
       )
     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
   elseif(component STREQUAL "MagickCore")
     FIND_IMAGEMAGICK_API(MagickCore "magick/MagickCore.h;MagickCore/MagickCore.h"
       Magick MagickCore CORE_RL_magick_
+      MagickCore-6 MagickCore-7
       MagickCore-Q16 MagickCore-Q8 MagickCore-Q16HDRI MagickCore-Q8HDRI
+      MagickCore-6.Q64 MagickCore-6.Q32 MagickCore-6.Q64HDRI MagickCore-6.Q32HDRI
       MagickCore-6.Q16 MagickCore-6.Q8 MagickCore-6.Q16HDRI MagickCore-6.Q8HDRI
+      MagickCore-7.Q64 MagickCore-7.Q32 MagickCore-7.Q64HDRI MagickCore-7.Q32HDRI
       MagickCore-7.Q16 MagickCore-7.Q8 MagickCore-7.Q16HDRI MagickCore-7.Q8HDRI
       )
     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindImageMagick.cmake |    9 +++++++++
 1 file changed, 9 insertions(+)


hooks/post-receive
-- 
CMake