mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-12 04:20:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'openssl-arm64-windows' into release-4.1

Browse Source 
bf52219e4c FindOpenSSL: Add support for ARM64 Windows pre-built binaries
5afebd310e FindOpenSSL: Refactor architecture-specific suffix table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10893
This commit is contained in:
Brad King
2025-06-19 14:19:15 +00:00
committed by Kitware Robot
parent bd3f836fa1 bf52219e4c
commit b8cbc0b2bb
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Modules/FindOpenSSL.cmake
View File

@@ -296,9 +296,13 @@ elseif (MSVC)
HINTS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL for ARM (64-bit)_is1;Inno Setup: App Path]"
)
if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ARM64")
set(_arch "Win64-ARM")
file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
elseif("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
set(_arch "Win64")
file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
else()
@@ -365,12 +369,14 @@ if(WIN32 AND NOT CYGWIN)
endif ()
# Since OpenSSL 1.1, lib names are like libcrypto32MTd.lib and libssl32MTd.lib
if( "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8" )
if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ARM64")
set(_OPENSSL_MSVC_FOLDER_SUFFIX "arm64")
elseif( "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8" )
set(_OPENSSL_MSVC_ARCH_SUFFIX "64")
set(_OPENSSL_MSVC_FOLDER_SUFFIX "64")
set(_OPENSSL_MSVC_FOLDER_SUFFIX "x64")
else()
set(_OPENSSL_MSVC_ARCH_SUFFIX "32")
set(_OPENSSL_MSVC_FOLDER_SUFFIX "86")
set(_OPENSSL_MSVC_FOLDER_SUFFIX "x86")
endif()
if(OPENSSL_USE_STATIC_LIBS)
@@ -378,13 +384,13 @@ if(WIN32 AND NOT CYGWIN)
"_static"
)
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"
"VC/static"
"lib"
)
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"
"VC/static"
"lib"
@@ -394,13 +400,13 @@ if(WIN32 AND NOT CYGWIN)
""
)
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"
"VC"
"lib"
)
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"
"VC"
"lib"