diff options
| author | Matthias Isele <MatthiasIsele@users.noreply.gitlab.kitware.com> | 2024-02-23 12:43:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-02-23 13:46:11 (GMT) |
| commit | 1327e0ff75f3997a7af7afdc1809551115211c1c (patch) | |
| tree | a17944fa8a3e0c6635aed671ca96e8e3452724d2 | |
| parent | 9cd34156f41f428df2febd2f5782c6080e8a6fa0 (diff) | |
| download | CMake-1327e0ff75f3997a7af7afdc1809551115211c1c.zip CMake-1327e0ff75f3997a7af7afdc1809551115211c1c.tar.gz CMake-1327e0ff75f3997a7af7afdc1809551115211c1c.tar.bz2 | |
FindOpenSSL: Update layout for Shining Light Productions package on Windows
Fixes: #25702
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 10282a0..3683f39 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -318,7 +318,14 @@ if(WIN32 AND NOT CYGWIN) set(_OPENSSL_STATIC_SUFFIX "_static" ) - set(_OPENSSL_PATH_SUFFIXES + set(_OPENSSL_PATH_SUFFIXES_DEBUG + "lib/VC/x${_OPENSSL_MSVC_ARCH_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d" + "lib/VC/static" + "VC/static" + "lib" + ) + set(_OPENSSL_PATH_SUFFIXES_RELEASE + "lib/VC/x${_OPENSSL_MSVC_ARCH_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}" "lib/VC/static" "VC/static" "lib" @@ -327,7 +334,14 @@ if(WIN32 AND NOT CYGWIN) set(_OPENSSL_STATIC_SUFFIX "" ) - set(_OPENSSL_PATH_SUFFIXES + set(_OPENSSL_PATH_SUFFIXES_DEBUG + "lib/VC/x${_OPENSSL_MSVC_ARCH_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d" + "lib/VC" + "VC" + "lib" + ) + set(_OPENSSL_PATH_SUFFIXES_RELEASE + "lib/VC/x${_OPENSSL_MSVC_ARCH_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}" "lib/VC" "VC" "lib" @@ -356,7 +370,7 @@ if(WIN32 AND NOT CYGWIN) NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES - ${_OPENSSL_PATH_SUFFIXES} + ${_OPENSSL_PATH_SUFFIXES_DEBUG} ) find_library(LIB_EAY_RELEASE @@ -381,7 +395,7 @@ if(WIN32 AND NOT CYGWIN) NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES - ${_OPENSSL_PATH_SUFFIXES} + ${_OPENSSL_PATH_SUFFIXES_RELEASE} ) find_library(SSL_EAY_DEBUG @@ -406,7 +420,7 @@ if(WIN32 AND NOT CYGWIN) NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES - ${_OPENSSL_PATH_SUFFIXES} + ${_OPENSSL_PATH_SUFFIXES_DEBUG} ) find_library(SSL_EAY_RELEASE @@ -431,7 +445,7 @@ if(WIN32 AND NOT CYGWIN) NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES - ${_OPENSSL_PATH_SUFFIXES} + ${_OPENSSL_PATH_SUFFIXES_RELEASE} ) set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}") |