diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2020-09-15 13:14:37 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2020-10-09 08:06:34 +0200 |
| commit | 22b72a6f7a8f6b056f1ab9c3c7806ae87bfefd8a (patch) | |
| tree | 97f1c8966db5e5fbb62c9561312a61ecfbd5ad6b | |
| parent | e88ba1159fe3e5bc2b8f9853edc9c2c742af7858 (diff) | |
win: Set correct target mkspec for qmake builds for arm64 builds
As there is no other way of obtaining information about Qt's paths at the
moment, windeployqt is still querying qmake for these information. For a
cross compiled Qt, the proper target mkspec has to be set in this case.
Change-Id: I0b7b7719c9055d432576185ac4f7572a5ba1dd6b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | cmake/QtBuild.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 6579aae37a..e0cad89cb9 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -277,7 +277,11 @@ if(WIN32) list(APPEND QT_DEFAULT_PLATFORM_DEFINITIONS WIN64 _WIN64) endif() if(MSVC) - set(QT_DEFAULT_MKSPEC win32-msvc) + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") + set(QT_DEFAULT_MKSPEC win32-arm64-msvc) + else() + set(QT_DEFAULT_MKSPEC win32-msvc) + endif() elseif(CLANG AND MINGW) set(QT_DEFAULT_MKSPEC win32-clang-g++) elseif(MINGW) |