diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-26 15:17:35 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-02-26 15:18:17 (GMT) |
| commit | 2c69f8abeed1137891f46fec8448f7ce2b0a62e6 (patch) | |
| tree | 7dda96d0fbaee86139f086cf31ec024346bd0301 /Modules | |
| parent | db5d798cd8dc1e379764b57f03c4ffd3030cbb50 (diff) | |
| parent | 1327e0ff75f3997a7af7afdc1809551115211c1c (diff) | |
| download | CMake-2c69f8abeed1137891f46fec8448f7ce2b0a62e6.zip CMake-2c69f8abeed1137891f46fec8448f7ce2b0a62e6.tar.gz CMake-2c69f8abeed1137891f46fec8448f7ce2b0a62e6.tar.bz2 | |
Merge topic 'FindOpenSSL-SLP-layout' into release-3.29
1327e0ff75 FindOpenSSL: Update layout for Shining Light Productions package on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9283
Diffstat (limited to 'Modules')
| -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}") |