summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-11-08 14:50:06 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-11-08 14:50:15 (GMT)
commitd8062b575b4a6246edeac264f6dce8fd3d64e3d6 (patch)
treebe507bec17a15597b22413cdba2a2e6a0e721438
parentb115e96fff2933fd29a4c065222920d192395deb (diff)
parent24d52daf49e8da92bf21eeb9f3687c84993ba2b6 (diff)
downloadCMake-d8062b575b4a6246edeac264f6dce8fd3d64e3d6.zip
CMake-d8062b575b4a6246edeac264f6dce8fd3d64e3d6.tar.gz
CMake-d8062b575b4a6246edeac264f6dce8fd3d64e3d6.tar.bz2
Merge topic 'openssl-pkg-config-directories'
24d52daf49 FindOpenSSL: Lookup all pkg-config directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4010
-rw-r--r--Modules/FindOpenSSL.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 33ceab7..3688ae9 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
)