From 361d0b7222fd35133186571762640aada67fa39b Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 12 Jul 2024 10:29:12 +0000 Subject: [PATCH] Revert "Ensure that we make case-insensitive comparison of CMAKE_SYSTEM_PROCESSOR" This reverts commit 7ae19cee1c782fadfbd0c617568fdad8aba9a493. Reason for revert: breaks non-cross QMake builds on Windows on ARM64. The QMake mkspec is now reported as win32-arm64-msvc, and apparently, QMake is not prepared for this. Pick-to: 6.8 Change-Id: I45c19719c6f0862580dbff09244337283305ee6c Reviewed-by: Joerg Bornemann --- cmake/QtMkspecHelpers.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cmake/QtMkspecHelpers.cmake b/cmake/QtMkspecHelpers.cmake index a9612966b5f..cd08daa2c44 100644 --- a/cmake/QtMkspecHelpers.cmake +++ b/cmake/QtMkspecHelpers.cmake @@ -33,13 +33,11 @@ macro(qt_internal_setup_platform_definitions_and_mkspec) set(QT_DEFAULT_MKSPEC win32-clang-g++) endif() elseif(MSVC) - string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" cmake_system_processor_case_independent) - if(cmake_system_processor_case_independent STREQUAL "arm64") + if(CMAKE_SYSTEM_PROCESSOR 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)