[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-316-gd8062b575b

[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  d8062b575b4a6246edeac264f6dce8fd3d64e3d6 (commit)
       via  24d52daf49e8da92bf21eeb9f3687c84993ba2b6 (commit)
      from  b115e96fff2933fd29a4c065222920d192395deb (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=d8062b575b4a6246edeac264f6dce8fd3d64e3d6
commit d8062b575b4a6246edeac264f6dce8fd3d64e3d6
Merge: b115e96fff 24d52daf49
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 8 14:50:06 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Nov 8 09:50:15 2019 -0500

    Merge topic 'openssl-pkg-config-directories'
    
    24d52daf49 FindOpenSSL: Lookup all pkg-config directories
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !4010


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24d52daf49e8da92bf21eeb9f3687c84993ba2b6
commit 24d52daf49e8da92bf21eeb9f3687c84993ba2b6
Author:     Denis Thulin <denis.thulin at enyx.fr>
AuthorDate: Thu Nov 7 15:39:52 2019 +0100
Commit:     Denis Thulin <denis.thulin at enyx.fr>
CommitDate: Thu Nov 7 16:44:12 2019 +0100

    FindOpenSSL: Lookup all pkg-config directories
    
    When using a custom sysroot to build things using pkg-config, some of
    the output variables feature the sysroot while others do not:
    
    ```console
    $ export PKG_CONFIG_SYSROOT_DIR=/path/to/sysroot
    $ export PKG_CONFIG_LIBDIR=/path/to/sysroot/usr/lib/pkgconfig
    $ pkg-config --cflags-only-I openssl
    -I/path/to/sysroot/usr/include/
    $ pkg-config --variable=includedir openssl
    /usr/include
    $ pkg-config --libs-only-L openssl
    -L/path/to/sysroot/usr/lib
    $ pkg-config --variable=libdir openssl
    /usr/lib
    ```
    
    When using `pkg_check_modules`, it's pretty much the same:
    ```cmake
    pkg_check_modules(_OPENSSL QUIET openssl)
    _OPENSSL_INCLUDE_DIRS == /path/to/sysroot/usr/include/
    _OPENSSL_INCLUDEDIR == /usr/include
    _OPENSSL_LIBRARY_DIRS == -L/path/to/sysroot/usr/lib
    _OPENSSL_LIBDIR == /usr/lib
    ```
    
    However, FindOpenSSL only searches for headers in `INCLUDEDIR` and
    libraries in `LIBDIR` instead of searching `INCLUDE_DIRS` and
    `LIBRARY_DIRS` as well.
    
    This fixes that behaviour.
    
    Fixes: #16885
    
    Signed-off-by: Denis Thulin <denis.thulin at enyx.fr>

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 33ceab7541..3688ae9dba 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -131,6 +131,7 @@ find_path(OPENSSL_INCLUDE_DIR
   ${_OPENSSL_ROOT_HINTS_AND_PATHS}
   HINTS
     ${_OPENSSL_INCLUDEDIR}
+    ${_OPENSSL_INCLUDE_DIRS}
   PATH_SUFFIXES
     include
 )
@@ -319,6 +320,7 @@ else()
     ${_OPENSSL_ROOT_HINTS_AND_PATHS}
     HINTS
       ${_OPENSSL_LIBDIR}
+      ${_OPENSSL_LIBRARY_DIRS}
     PATH_SUFFIXES
       lib
   )
@@ -330,6 +332,7 @@ else()
     ${_OPENSSL_ROOT_HINTS_AND_PATHS}
     HINTS
       ${_OPENSSL_LIBDIR}
+      ${_OPENSSL_LIBRARY_DIRS}
     PATH_SUFFIXES
       lib
   )

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

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


hooks/post-receive
-- 
CMake