diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2021-06-08 15:02:13 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-15 02:57:01 +0000 |
| commit | 2e2f052530afedfe50ed55cef3bc3bd5b6e47f20 (patch) | |
| tree | d0964eca884509de495c77a596cac73771782cf1 /configure.cmake | |
| parent | 201ebb43c89fb680c31765129b18810c2b25d514 (diff) | |
Enable native arm64 builds on macOS
Chromium builds on arm are still experimental, but we want to enable
them in the CI in order to see when things break.
Change-Id: I9e37fd97eb5a3dc680dc16404c22b97f780b4b9f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 712702757f105aa2390b00c8412950967aa1e881)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/configure.cmake b/configure.cmake index 24898a405..426811330 100644 --- a/configure.cmake +++ b/configure.cmake @@ -317,15 +317,11 @@ qt_feature("webengine-ozone-x11" PRIVATE #### Support Checks if(APPLE AND NOT IOS AND - ( - (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" AND CMAKE_OSX_ARCHITECTURES STREQUAL "") - OR - ("arm64" IN_LIST CMAKE_OSX_ARCHITECTURES) - ) + (CMAKE_OSX_ARCHITECTURES MATCHES ";") ) - set(MAC_ARM_64 ON) + set(MAC_UNIVERSAL ON) else() - set(MAC_ARM_64 OFF) + set(MAC_UNIVERSAL OFF) endif() if(WIN32 AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR CMAKE_CROSSCOMPILING)) @@ -337,7 +333,7 @@ endif() assertTargets(webEngineError webEngineSupport Gui Widgets OpenGL OpenGLWidgets Quick Qml) add_check_for_support(webEngineError webEngineSupport MODULE QtWebEngine - CONDITION (LINUX AND NOT CMAKE_CROSSCOMPILING) OR (WIN32 AND NOT WIN_ARM_64) OR (MACOS AND NOT MAC_ARM_64) + CONDITION (LINUX AND NOT CMAKE_CROSSCOMPILING) OR (WIN32 AND NOT WIN_ARM_64) OR (MACOS AND NOT MAC_UNIVERSAL) MESSAGE "Build can be done only on Linux, Windows or macOS." ) add_check_for_support(webEngineError webEngineSupport |