diff options
| author | Brad King <brad.king@kitware.com> | 2023-05-22 16:37:19 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-05-22 16:37:27 (GMT) |
| commit | 970716e232de344cbf519d88955e58b3c925f877 (patch) | |
| tree | 08405b0380990a113e0d7819dc59ca4dcf5c135b /Modules | |
| parent | 7e68e5cf2559af6f69ab9b7ae584b942e3215bb6 (diff) | |
| parent | 5cc8a69867ac42333a656607d90059a6db823abd (diff) | |
| download | CMake-970716e232de344cbf519d88955e58b3c925f877.zip CMake-970716e232de344cbf519d88955e58b3c925f877.tar.gz CMake-970716e232de344cbf519d88955e58b3c925f877.tar.bz2 | |
Merge topic 'FindOpenSSL-trust-root-dir'
5cc8a69867 FindOpenSSL: Trust the user's OPENSSL_ROOT_DIR
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8486
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 45dc9ac..fd6886f 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -230,13 +230,15 @@ else() set(_OPENSSL_FIND_PATH_SUFFIX "include") endif() -if (MSVC) +if ((DEFINED OPENSSL_ROOT_DIR) OR (DEFINED ENV{OPENSSL_ROOT_DIR})) + set(_OPENSSL_ROOT_HINTS HINTS ${OPENSSL_ROOT_DIR} ENV OPENSSL_ROOT_DIR) + set(_OPENSSL_ROOT_PATHS NO_DEFAULT_PATH) +elseif (MSVC) # http://www.slproweb.com/products/Win32OpenSSL.html set(_OPENSSL_ROOT_HINTS - ${OPENSSL_ROOT_DIR} + HINTS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]" - ENV OPENSSL_ROOT_DIR ) if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") @@ -255,6 +257,7 @@ if (MSVC) endif() set(_OPENSSL_ROOT_PATHS + PATHS "${_programfiles}/OpenSSL" "${_programfiles}/OpenSSL-${_arch}" "C:/OpenSSL/" @@ -262,16 +265,11 @@ if (MSVC) ) unset(_programfiles) unset(_arch) -else () - set(_OPENSSL_ROOT_HINTS - ${OPENSSL_ROOT_DIR} - ENV OPENSSL_ROOT_DIR - ) endif () set(_OPENSSL_ROOT_HINTS_AND_PATHS - HINTS ${_OPENSSL_ROOT_HINTS} - PATHS ${_OPENSSL_ROOT_PATHS} + ${_OPENSSL_ROOT_HINTS} + ${_OPENSSL_ROOT_PATHS} ) find_path(OPENSSL_INCLUDE_DIR |