diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2021-06-08 15:02:13 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-14 22:59:22 +0200 |
| commit | 712702757f105aa2390b00c8412950967aa1e881 (patch) | |
| tree | 8cdd2ec78e43a73517138983d661b7c27fd8ed64 | |
| parent | f04bc6833c01efc0fb37d6f6c31c6fa427087664 (diff) | |
| download | qtwebengine-712702757f105aa2390b00c8412950967aa1e881.tar.gz | |
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.
Pick-to: 6.2
Change-Id: I9e37fd97eb5a3dc680dc16404c22b97f780b4b9f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | configure.cmake | 12 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 6 |
2 files changed, 10 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 diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 3f95156bd..b5c30d3b9 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -479,6 +479,12 @@ foreach(config ${configs}) use_external_popup_menu=false angle_enable_vulkan=false ) + if (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR CMAKE_OSX_ARCHITECTURES STREQUAL "arm64") + list(APPEND gnArgArg + target_cpu="arm64" + fatal_linker_warnings=false + ) + endif() endif() if(WIN32) |