1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Ensure that we make case-insensitive comparison of CMAKE_SYSTEM_PROCESSOR"

Browse Source 
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 <joerg.bornemann@qt.io>
This commit is contained in:
Alexey Edelev 2024-07-12 10:29:12 +00:00 committed by Joerg Bornemann
parent 488362257d
commit 361d0b7222
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtMkspecHelpers.cmake
View File

@ -33,13 +33,11 @@ macro(qt_internal_setup_platform_definitions_and_mkspec)
set(QT_DEFAULT_MKSPEC win32-clang-g++) set(QT_DEFAULT_MKSPEC win32-clang-g++)
endif() endif()
elseif(MSVC) elseif(MSVC)
string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" cmake_system_processor_case_independent) if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
if(cmake_system_processor_case_independent STREQUAL "arm64")
set(QT_DEFAULT_MKSPEC win32-arm64-msvc) set(QT_DEFAULT_MKSPEC win32-arm64-msvc)
else() else()
set(QT_DEFAULT_MKSPEC win32-msvc) set(QT_DEFAULT_MKSPEC win32-msvc)
endif() endif()
unset(cmake_system_processor_case_independent)
elseif(MINGW) elseif(MINGW)
set(QT_DEFAULT_MKSPEC win32-g++) set(QT_DEFAULT_MKSPEC win32-g++)
list(APPEND QT_DEFAULT_PLATFORM_DEFINITIONS MINGW_HAS_SECURE_API=1) list(APPEND QT_DEFAULT_PLATFORM_DEFINITIONS MINGW_HAS_SECURE_API=1)