[Cmake-commits] CMake branch, next, updated. v2.8.11-2247-g898a30c

[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  898a30ce6278153dc4c8d37363c4d6445800df43 (commit)
       via  3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a (commit)
      from  c14659fcdebb753d41f91b9498a246fd10486539 (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=898a30ce6278153dc4c8d37363c4d6445800df43
commit 898a30ce6278153dc4c8d37363c4d6445800df43
Merge: c14659f 3de9bb4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 28 09:45:40 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 28 09:45:40 2013 -0400

    Merge topic 'FindImageMagick-v6-includes' into next
    
    3de9bb4 FindImageMagick: Find v6 include dir (#14174)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a
commit 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a
Author:     Funda Wang <fundawang at gmail.com>
AuthorDate: Tue May 28 06:17:49 2013 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 28 09:43:29 2013 -0400

    FindImageMagick: Find v6 include dir (#14174)
    
    The header files of ImageMagick are now located at
    <prefix>/include/ImageMagick-6 instead of <prefix>/include/ImageMagick.

diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index cd97b38..02a5777 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header)
       ${ImageMagick_INCLUDE_DIRS}
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
     PATH_SUFFIXES
-      ImageMagick
+      ImageMagick ImageMagick-6
     DOC "Path to the ImageMagick include dir."
     )
   find_library(ImageMagick_${component}_LIBRARY

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

Summary of changes:
 Modules/FindImageMagick.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake