diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-07-20 12:34:39 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-07-23 16:32:42 +0200 |
| commit | d39f8065a23aade87a83357adf8b02cdde79f4b1 (patch) | |
| tree | c0536712ea119b75a526cebed5316a72b35591db /configure.cmake | |
| parent | 132681d3a3081c1fbf2ce1b39dca4a0ee6516f25 (diff) | |
Add support for macOS universal builds
Change-Id: I416036a925167204cf5121108922911bce854352
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 35144cbc3a285029574ea3ef45e4a6790f9607e4)
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/configure.cmake b/configure.cmake index 71821c484..9684661e5 100644 --- a/configure.cmake +++ b/configure.cmake @@ -320,14 +320,6 @@ qt_feature("webengine-ozone-x11" PRIVATE ) #### Support Checks -if(APPLE AND NOT IOS AND - (CMAKE_OSX_ARCHITECTURES MATCHES ";") -) - set(MAC_UNIVERSAL ON) -else() - set(MAC_UNIVERSAL OFF) -endif() - if(WIN32 AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR CMAKE_CROSSCOMPILING)) set(WIN_ARM_64 ON) else() @@ -337,7 +329,7 @@ endif() assertTargets(webEngineError webEngineSupport Gui Widgets OpenGL OpenGLWidgets Quick Qml) add_check_for_support(webEngineError webEngineSupport MODULE QtWebEngine - CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR (MACOS AND NOT MAC_UNIVERSAL) + CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR (MACOS AND NOT CMAKE_CROSSCOMPILING) MESSAGE "Build can be done only on Linux, Windows or macOS." ) if(LINUX AND CMAKE_CROSSCOMPILING) |