diff options
| author | Matthias Isele <MatthiasIsele@users.noreply.gitlab.kitware.com> | 2024-04-03 20:50:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-04-03 20:59:13 (GMT) |
| commit | aa86f487c23a080b381b1b605056f8f394269223 (patch) | |
| tree | e72a0a271f1ef5cf1aa8ff1d000d69d9090f5073 /Modules | |
| parent | a4774b0c10e9ce5354b9a7a721f8ff2952d1f247 (diff) | |
| download | CMake-aa86f487c23a080b381b1b605056f8f394269223.zip CMake-aa86f487c23a080b381b1b605056f8f394269223.tar.gz CMake-aa86f487c23a080b381b1b605056f8f394269223.tar.bz2 | |
FindOpenSSL: Update layout for Shining Light Productions 32-bit package
Issue: #25856
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 3683f39..5ecef0c 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -310,8 +310,10 @@ if(WIN32 AND NOT CYGWIN) # Since OpenSSL 1.1, lib names are like libcrypto32MTd.lib and libssl32MTd.lib if( "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8" ) set(_OPENSSL_MSVC_ARCH_SUFFIX "64") + set(_OPENSSL_MSVC_FOLDER_SUFFIX "64") else() set(_OPENSSL_MSVC_ARCH_SUFFIX "32") + set(_OPENSSL_MSVC_FOLDER_SUFFIX "86") endif() if(OPENSSL_USE_STATIC_LIBS) @@ -319,13 +321,13 @@ if(WIN32 AND NOT CYGWIN) "_static" ) set(_OPENSSL_PATH_SUFFIXES_DEBUG - "lib/VC/x${_OPENSSL_MSVC_ARCH_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d" + "lib/VC/x${_OPENSSL_MSVC_FOLDER_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/x${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}" "lib/VC/static" "VC/static" "lib" @@ -335,13 +337,13 @@ if(WIN32 AND NOT CYGWIN) "" ) set(_OPENSSL_PATH_SUFFIXES_DEBUG - "lib/VC/x${_OPENSSL_MSVC_ARCH_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d" + "lib/VC/x${_OPENSSL_MSVC_FOLDER_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/x${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}" "lib/VC" "VC" "lib" |