[Cmake-commits] CMake branch, next, updated. v3.4.1-1929-g06de555

[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  06de555a31bed2eb841cee3cb1f0e669cbe9eeeb (commit)
       via  36d87e18a1ffe4d4f23fbd1bb4ba77c9bc10c099 (commit)
      from  c60dfb9be771334ca19d146a99315680f9f53acd (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=06de555a31bed2eb841cee3cb1f0e669cbe9eeeb
commit 06de555a31bed2eb841cee3cb1f0e669cbe9eeeb
Merge: c60dfb9 36d87e1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 12 13:42:34 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 12 13:42:34 2016 -0500

    Merge topic 'FindPkgConfig-share-dir' into next
    
    36d87e18 FindPkgConfig: add PREFIX/share/pkgconfig to PKG_CONFIG_PATH (#15910)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36d87e18a1ffe4d4f23fbd1bb4ba77c9bc10c099
commit 36d87e18a1ffe4d4f23fbd1bb4ba77c9bc10c099
Author:     Sam Thursfield <sam.thursfield at codethink.co.uk>
AuthorDate: Tue Jan 12 15:48:55 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 12 13:42:17 2016 -0500

    FindPkgConfig: add PREFIX/share/pkgconfig to PKG_CONFIG_PATH (#15910)
    
    Most packages install their .pc files into PREFIX/lib/pkgconfig, but
    some put them into PREFIX/share/pkgconfig. Either is valid, and
    pkg-config itself looks in both for the /usr and /usr/local prefixes.
    
    This fixes an issue where some packages (yajl, for example) are not
    found if they are installed into a non-standard prefix and
    CMAKE_PREFIX_PATH is used to locate them.

diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index d519c1d..eba6953 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -263,6 +263,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
         endif()
       endif()
       list(APPEND _lib_dirs "lib/pkgconfig")
+      list(APPEND _lib_dirs "share/pkgconfig")
 
       # Check if directories exist and eventually append them to the
       # pkgconfig path list

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

Summary of changes:
 Modules/FindPkgConfig.cmake |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake