Skip to content

Commit

Permalink
Revert "Revert "Ensure that we make case-insensitive comparison of CM…
Browse files Browse the repository at this point in the history
…AKE_SYSTEM_PROCESSOR""

This reverts commit 361d0b7.

The qmake behavior is fixed by b66ecb2
so that the original fix can be reinstantiated.

Pick-to: 6.8
Change-Id: I5338e4cbebc963f48469e7492f18375e56a46200
Reviewed-by:  Alexey Edelev <[email protected]>
Reviewed-by: Joerg Bornemann <[email protected]>
  • Loading branch information
owolff committed Jul 16, 2024
1 parent 404ad4e commit 39c36d3
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion cmake/QtMkspecHelpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 39c36d3

Please sign in to comment.