diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-02-17 01:13:36 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2024-02-26 12:29:16 +0100 |
| commit | 73d2e9d6d6314f3c209dd4f1135f7376e72602fa (patch) | |
| tree | 4b63b5a95c5e9c2384200a1fba10ecc30b73a63f /cmake/macros | |
| parent | 11b6b476d6a6569ee5680d83d165255f206555f9 (diff) | |
Build: Improve ARM target detection in cmake (needed by MSVC)
(cherry picked from commit 7e51d17a0aa06c7aaf25a836d90487b17383fca7)
Diffstat (limited to 'cmake/macros')
| -rw-r--r-- | cmake/macros/CheckPlatform.cmake | 23 | ||||
| -rw-r--r-- | cmake/macros/FindOpenSSL.cmake | 4 |
2 files changed, 25 insertions, 2 deletions
diff --git a/cmake/macros/CheckPlatform.cmake b/cmake/macros/CheckPlatform.cmake index 0f41a9c127e..c0a5185b805 100644 --- a/cmake/macros/CheckPlatform.cmake +++ b/cmake/macros/CheckPlatform.cmake @@ -7,6 +7,29 @@ else() MESSAGE(STATUS "Detected 32-bit platform") endif() +if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64") + set(TRINITY_SYSTEM_PROCESSOR "amd64") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|ARM)64$") + set(TRINITY_SYSTEM_PROCESSOR "arm64") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|ARM)$") + set(TRINITY_SYSTEM_PROCESSOR "arm") +else() + set(TRINITY_SYSTEM_PROCESSOR "x86") +endif() + +# detect MSVC special case of using cmake -A switch (which doesn't set any cross compiling variables) +if(CMAKE_GENERATOR_PLATFORM STREQUAL "Win32") + set(TRINITY_SYSTEM_PROCESSOR "x86") +elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "x64") + set(TRINITY_SYSTEM_PROCESSOR "amd64") +elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM") + set(TRINITY_SYSTEM_PROCESSOR "arm") +elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64") + set(TRINITY_SYSTEM_PROCESSOR "arm64") +endif() + +message(STATUS "Detected ${TRINITY_SYSTEM_PROCESSOR} processor architecture") + if(WIN32) include("${CMAKE_SOURCE_DIR}/cmake/platform/win/settings.cmake") elseif(UNIX) diff --git a/cmake/macros/FindOpenSSL.cmake b/cmake/macros/FindOpenSSL.cmake index c9122caf10e..8367167e60d 100644 --- a/cmake/macros/FindOpenSSL.cmake +++ b/cmake/macros/FindOpenSSL.cmake @@ -238,7 +238,7 @@ elseif (MSVC) set(_OPENSSL_MSI_INSTALL_GUIDS "") if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") - if(CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64") + if(TRINITY_SYSTEM_PROCESSOR STREQUAL "arm64") set(_arch "Win64-ARM") set(_OPENSSL_MSI_INSTALL_GUIDS "99C28AFA-6419-40B1-B88D-32B810BB4234") else() @@ -331,7 +331,7 @@ 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") - if(CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64") + if(TRINITY_SYSTEM_PROCESSOR STREQUAL "arm64") set(_OPENSSL_MSVC_ARCH_DIRECTORY "arm64") else() set(_OPENSSL_MSVC_ARCH_DIRECTORY "x64") |