From fbee3c4864d58d6e490c8d3c8223c7f9d2932cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20=C3=85lund?= <fredrik.alund@mimer.com>
Date: Sun, 15 Oct 2023 00:43:48 +0200
Subject: [PATCH] Build the QtSql plugin for Mimer SQL on macOS in universal
 binary mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With the new provisioning scripts the QtSql plugin for Mimer SQL can now
be built in universal binary mode on macOS

Fixes: QTBUG-111219
Pick-to: 6.6
Change-Id: Iefc45b510bd17822aa7782a2c42860941eb19fc8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit d557718d68184f6b56b17a3b5b54d1d5511a5294)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 cmake/FindMimer.cmake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cmake/FindMimer.cmake b/cmake/FindMimer.cmake
index 12da9002090..5cbc6e69070 100644
--- a/cmake/FindMimer.cmake
+++ b/cmake/FindMimer.cmake
@@ -43,8 +43,7 @@ else()
             else()
                 set(MimerSQL_library_hints "")
             endif()
-        elseif(APPLE AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin"
-                AND CMAKE_OSX_ARCHITECTURES MATCHES "^(x86_64|arm64|)$")
+        elseif(APPLE AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
             set(MimerSQL_library_hints "/usr/local/lib")
             set(MimerSQL_include_dir_hints "/usr/local/include")
         else()