From 2623d34003d97549aef9972f598d9fcdbe182def Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Mon, 15 Jul 2024 09:43:25 +0200 Subject: [PATCH] Revert "Revert "Ensure that we make case-insensitive comparison of CMAKE_SYSTEM_PROCESSOR"" This reverts commit 361d0b7222fd35133186571762640aada67fa39b. The qmake behavior is fixed by b66ecb295ecc3981b1c21f01d62c9066f5d6e6ca so that the original fix can be reinstantiated. Change-Id: I5338e4cbebc963f48469e7492f18375e56a46200 Reviewed-by: Alexey Edelev Reviewed-by: Joerg Bornemann (cherry picked from commit 39c36d3230ea26ff327bb1d727c1fd049932fb93) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtMkspecHelpers.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/QtMkspecHelpers.cmake b/cmake/QtMkspecHelpers.cmake index cd08daa2c44..a9612966b5f 100644 --- a/cmake/QtMkspecHelpers.cmake +++ b/cmake/QtMkspecHelpers.cmake @@ -33,11 +33,13 @@ macro(qt_internal_setup_platform_definitions_and_mkspec) set(QT_DEFAULT_MKSPEC win32-clang-g++) endif() elseif(MSVC) - if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") + string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" cmake_system_processor_case_independent) + if(cmake_system_processor_case_independent STREQUAL "arm64") set(QT_DEFAULT_MKSPEC win32-arm64-msvc) else() set(QT_DEFAULT_MKSPEC win32-msvc) endif() + unset(cmake_system_processor_case_independent) elseif(MINGW) set(QT_DEFAULT_MKSPEC win32-g++) list(APPEND QT_DEFAULT_PLATFORM_DEFINITIONS MINGW_HAS_SECURE_API=1)