[Cmake-commits] CMake branch, next, updated. v3.0.0-4236-g1879768

[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  1879768f019fc8a68dc7e4a8c3431efe2da17ef7 (commit)
       via  90245fe86e4c5810034b5ac793609c2ecbfa07b8 (commit)
      from  9e9d6984b765ce89cd29ee229973b6bd59fdcec4 (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=1879768f019fc8a68dc7e4a8c3431efe2da17ef7
commit 1879768f019fc8a68dc7e4a8c3431efe2da17ef7
Merge: 9e9d698 90245fe
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 14 15:05:14 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 14 15:05:14 2014 -0400

    Merge topic 'FindImageMagick-pkgconfig' into next
    
    90245fe8 FindImageMagick: Use pkgconfig hints if available (#14012)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90245fe86e4c5810034b5ac793609c2ecbfa07b8
commit 90245fe86e4c5810034b5ac793609c2ecbfa07b8
Author:     Rex Dieter <rdieter at fedoraproject.org>
AuthorDate: Mon Jul 14 15:04:13 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 14 15:05:28 2014 -0400

    FindImageMagick: Use pkgconfig hints if available (#14012)
    
    Tested-by: bastien ROUCARIES <roucaries.bastien at gmail.com>

diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index 4f0e687..f6c8b3a 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -95,14 +95,21 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
+find_package(PkgConfig QUIET)
+
 #---------------------------------------------------------------------
 # Helper functions
 #---------------------------------------------------------------------
 function(FIND_IMAGEMAGICK_API component header)
   set(ImageMagick_${component}_FOUND FALSE PARENT_SCOPE)
 
+  pkg_check_modules(PC_${component} QUIET ${component})
+
   find_path(ImageMagick_${component}_INCLUDE_DIR
     NAMES ${header}
+    HINTS
+      ${PC_${component}_INCLUDEDIR}
+      ${PC_${component}_INCLUDE_DIRS}
     PATHS
       ${ImageMagick_INCLUDE_DIRS}
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
@@ -112,6 +119,9 @@ function(FIND_IMAGEMAGICK_API component header)
     )
   find_library(ImageMagick_${component}_LIBRARY
     NAMES ${ARGN}
+    HINTS
+      ${PC_${component}_LIBDIR}
+      ${PC_${component}_LIB_DIRS}
     PATHS
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/lib"
     DOC "Path to the ImageMagick Magick++ library."

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

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


hooks/post-receive
-- 
CMake