[Cmake-commits] CMake branch, next, updated. v3.0.0-4498-g74bdbe6

[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  74bdbe6e7400afc49a7223295cf0e5e078b1c478 (commit)
       via  1342e0222fed06f748f266a3a4e82c907cb76726 (commit)
       via  6f5581c105d59ed00cc065b9ab9b3c8c0a441db3 (commit)
      from  3a60ea462359e6ef58a914d89cef3226229b43d0 (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=74bdbe6e7400afc49a7223295cf0e5e078b1c478
commit 74bdbe6e7400afc49a7223295cf0e5e078b1c478
Merge: 3a60ea4 1342e02
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 24 13:43:50 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 24 13:43:50 2014 -0400

    Merge topic 'FindImageMagick-arch-include-dir' into next
    
    1342e022 FindImageMagick: Provide per-component include dirs (#15007)
    6f5581c1 FindImageMagick: Find arch include dir (#15007)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1342e0222fed06f748f266a3a4e82c907cb76726
commit 1342e0222fed06f748f266a3a4e82c907cb76726
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 23 15:33:48 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 23 15:33:48 2014 -0400

    FindImageMagick: Provide per-component include dirs (#15007)
    
    Set the ImageMagick_<component>_INCLUDE_DIRS variable that is mentioned
    in the documentation but was not set before.

diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index 33f95ce..65458b7 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -143,13 +143,20 @@ function(FIND_IMAGEMAGICK_API component header)
   if(ImageMagick_${component}_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY)
     set(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE)
 
-    list(APPEND ImageMagick_INCLUDE_DIRS
+    # Construct per-component include directories.
+    set(ImageMagick_${component}_INCLUDE_DIRS
       ${ImageMagick_${component}_INCLUDE_DIR}
       )
     if(ImageMagick_${component}_ARCH_INCLUDE_DIR)
-      list(APPEND ImageMagick_INCLUDE_DIRS
+      list(APPEND ImageMagick_${component}_INCLUDE_DIRS
         ${ImageMagick_${component}_ARCH_INCLUDE_DIR})
     endif()
+    list(REMOVE_DUPLICATES ImageMagick_${component}_INCLUDE_DIRS)
+    set(ImageMagick_${component}_INCLUDE_DIRS
+      ${ImageMagick_${component}_INCLUDE_DIRS} PARENT_SCOPE)
+
+    # Add the per-component include directories to the full include dirs.
+    list(APPEND ImageMagick_INCLUDE_DIRS ${ImageMagick_${component}_INCLUDE_DIRS})
     list(REMOVE_DUPLICATES ImageMagick_INCLUDE_DIRS)
     set(ImageMagick_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS} PARENT_SCOPE)
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f5581c105d59ed00cc065b9ab9b3c8c0a441db3
commit 6f5581c105d59ed00cc065b9ab9b3c8c0a441db3
Author:     bastien ROUCARIES <roucaries.bastien at gmail.com>
AuthorDate: Tue Jul 22 22:24:15 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 23 09:44:55 2014 -0400

    FindImageMagick: Find arch include dir (#15007)

diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index f6c8b3a..33f95ce 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -115,7 +115,19 @@ function(FIND_IMAGEMAGICK_API component header)
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
     PATH_SUFFIXES
       ImageMagick ImageMagick-6
-    DOC "Path to the ImageMagick include dir."
+    DOC "Path to the ImageMagick arch-independent include dir."
+    )
+  find_path(ImageMagick_${component}_ARCH_INCLUDE_DIR
+    NAMES magick/magick-baseconfig.h
+    HINTS
+      ${PC_${component}_INCLUDEDIR}
+      ${PC_${component}_INCLUDE_DIRS}
+    PATHS
+      ${ImageMagick_INCLUDE_DIRS}
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
+    PATH_SUFFIXES
+      ImageMagick ImageMagick-6
+    DOC "Path to the ImageMagick arch-specific include dir."
     )
   find_library(ImageMagick_${component}_LIBRARY
     NAMES ${ARGN}
@@ -127,12 +139,17 @@ function(FIND_IMAGEMAGICK_API component header)
     DOC "Path to the ImageMagick Magick++ library."
     )
 
+  # old version have only indep dir
   if(ImageMagick_${component}_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY)
     set(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE)
 
     list(APPEND ImageMagick_INCLUDE_DIRS
       ${ImageMagick_${component}_INCLUDE_DIR}
       )
+    if(ImageMagick_${component}_ARCH_INCLUDE_DIR)
+      list(APPEND ImageMagick_INCLUDE_DIRS
+        ${ImageMagick_${component}_ARCH_INCLUDE_DIR})
+    endif()
     list(REMOVE_DUPLICATES ImageMagick_INCLUDE_DIRS)
     set(ImageMagick_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS} PARENT_SCOPE)
 

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

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


hooks/post-receive
-- 
CMake