mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 04:40:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindOpenSSL: Refactor architecture-specific suffix table

Browse Source 
Do not assume all suffixes start with `x`.
This commit is contained in:
Matej Kenda
2025-06-17 17:01:57 +02:00
committed by Brad King
parent ce6e309971
commit 5afebd310e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/FindOpenSSL.cmake
View File

@@ -367,10 +367,10 @@ if(WIN32 AND NOT CYGWIN)
# Since OpenSSL 1.1, lib names are like libcrypto32MTd.lib and libssl32MTd.lib # Since OpenSSL 1.1, lib names are like libcrypto32MTd.lib and libssl32MTd.lib
if( "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8" ) if( "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8" )
set(_OPENSSL_MSVC_ARCH_SUFFIX "64") set(_OPENSSL_MSVC_ARCH_SUFFIX "64")
set(_OPENSSL_MSVC_FOLDER_SUFFIX "64") set(_OPENSSL_MSVC_FOLDER_SUFFIX "x64")
else() else()
set(_OPENSSL_MSVC_ARCH_SUFFIX "32") set(_OPENSSL_MSVC_ARCH_SUFFIX "32")
set(_OPENSSL_MSVC_FOLDER_SUFFIX "86") set(_OPENSSL_MSVC_FOLDER_SUFFIX "x86")
endif() endif()
if(OPENSSL_USE_STATIC_LIBS) if(OPENSSL_USE_STATIC_LIBS)
@@ -378,13 +378,13 @@ if(WIN32 AND NOT CYGWIN)
"_static" "_static"
) )
set(_OPENSSL_PATH_SUFFIXES_DEBUG set(_OPENSSL_PATH_SUFFIXES_DEBUG
"lib/VC/x${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d" "lib/VC/${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d"
"lib/VC/static" "lib/VC/static"
"VC/static" "VC/static"
"lib" "lib"
) )
set(_OPENSSL_PATH_SUFFIXES_RELEASE set(_OPENSSL_PATH_SUFFIXES_RELEASE
"lib/VC/x${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}" "lib/VC/${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}"
"lib/VC/static" "lib/VC/static"
"VC/static" "VC/static"
"lib" "lib"
@@ -394,13 +394,13 @@ if(WIN32 AND NOT CYGWIN)
"" ""
) )
set(_OPENSSL_PATH_SUFFIXES_DEBUG set(_OPENSSL_PATH_SUFFIXES_DEBUG
"lib/VC/x${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d" "lib/VC/${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}d"
"lib/VC" "lib/VC"
"VC" "VC"
"lib" "lib"
) )
set(_OPENSSL_PATH_SUFFIXES_RELEASE set(_OPENSSL_PATH_SUFFIXES_RELEASE
"lib/VC/x${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}" "lib/VC/${_OPENSSL_MSVC_FOLDER_SUFFIX}/${_OPENSSL_MSVC_RT_MODE}"
"lib/VC" "lib/VC"
"VC" "VC"
"lib" "lib"