From 35144cbc3a285029574ea3ef45e4a6790f9607e4 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 20 Jul 2021 12:34:39 +0200 Subject: Add support for macOS universal builds Pick-to: 6.2 Change-Id: I416036a925167204cf5121108922911bce854352 Reviewed-by: Michal Klocek --- configure.cmake | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'configure.cmake') 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) -- cgit v1.2.1