diff options
| author | Brad King <brad.king@kitware.com> | 2024-04-04 13:29:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-04-04 13:29:25 (GMT) |
| commit | 5fc6d6165cafb31d43f4f5b8e94943ac1b9046b5 (patch) | |
| tree | 879e6199f3e25acc492145d7eaabb1129a156bfd | |
| parent | a4774b0c10e9ce5354b9a7a721f8ff2952d1f247 (diff) | |
| parent | 9ff5dae3f6bb1168007c07dfa060c5160d303ea2 (diff) | |
| download | CMake-5fc6d6165cafb31d43f4f5b8e94943ac1b9046b5.zip CMake-5fc6d6165cafb31d43f4f5b8e94943ac1b9046b5.tar.gz CMake-5fc6d6165cafb31d43f4f5b8e94943ac1b9046b5.tar.bz2 | |
Merge topic 'FindOpenSSL-SLP-layout' into release-3.29
9ff5dae3f6 FindOpenSSL: Update layout for Shining Light Productions debug libraries
aa86f487c2 FindOpenSSL: Update layout for Shining Light Productions 32-bit package
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9402
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 3683f39..057a8d1 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" @@ -356,6 +358,7 @@ if(WIN32 AND NOT CYGWIN) libcrypto${_OPENSSL_STATIC_SUFFIX}${_OPENSSL_MSVC_ARCH_SUFFIX}${_OPENSSL_MSVC_RT_MODE}d libcrypto${_OPENSSL_STATIC_SUFFIX}${_OPENSSL_MSVC_RT_MODE}d libcrypto${_OPENSSL_STATIC_SUFFIX}d + libcrypto${_OPENSSL_STATIC_SUFFIX} libeay32${_OPENSSL_STATIC_SUFFIX}${_OPENSSL_MSVC_RT_MODE}d libeay32${_OPENSSL_STATIC_SUFFIX}d crypto${_OPENSSL_STATIC_SUFFIX}d @@ -406,6 +409,7 @@ if(WIN32 AND NOT CYGWIN) libssl${_OPENSSL_STATIC_SUFFIX}${_OPENSSL_MSVC_ARCH_SUFFIX}${_OPENSSL_MSVC_RT_MODE}d libssl${_OPENSSL_STATIC_SUFFIX}${_OPENSSL_MSVC_RT_MODE}d libssl${_OPENSSL_STATIC_SUFFIX}d + libssl${_OPENSSL_STATIC_SUFFIX} ssleay32${_OPENSSL_STATIC_SUFFIX}${_OPENSSL_MSVC_RT_MODE}d ssleay32${_OPENSSL_STATIC_SUFFIX}d ssl${_OPENSSL_STATIC_SUFFIX}d |