From aa86f487c23a080b381b1b605056f8f394269223 Mon Sep 17 00:00:00 2001 From: Matthias Isele Date: Wed, 3 Apr 2024 16:50:57 -0400 Subject: FindOpenSSL: Update layout for Shining Light Productions 32-bit package Issue: #25856 --- Modules/FindOpenSSL.cmake | 10 ++++++---- 1 file 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" -- cgit v0.12 From 9ff5dae3f6bb1168007c07dfa060c5160d303ea2 Mon Sep 17 00:00:00 2001 From: Matthias Isele Date: Wed, 3 Apr 2024 16:58:45 -0400 Subject: FindOpenSSL: Update layout for Shining Light Productions debug libraries The installer no longer names debug libraries with a `d` suffix. They are distinguished by the per-runtime-library directory containing them. Fixes: #25856 --- Modules/FindOpenSSL.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 5ecef0c..057a8d1 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -358,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 @@ -408,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 -- cgit v0.12