From 7c2167d3b886c8f2eb1ea6161f12440dfa8cf401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=85lund?= Date: Wed, 4 Oct 2023 16:32:47 +0200 Subject: [PATCH] Only build the Mimer SQL QtSql plugin for macOS on arm64 and x86_64 The Mimer SQL installation does not support universal binaries. Skip building the Mimer SQL QtSql plugin when doing universal binary builds of Qt for macOS Change-Id: Ib0fad2d626fe65d886d5bf2f4848dda09bf65b14 Reviewed-by: Volker Hilsheimer --- cmake/FindMimer.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/FindMimer.cmake b/cmake/FindMimer.cmake index 5cbc6e69070..12da9002090 100644 --- a/cmake/FindMimer.cmake +++ b/cmake/FindMimer.cmake @@ -43,7 +43,8 @@ else() else() set(MimerSQL_library_hints "") endif() - elseif(APPLE AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + elseif(APPLE AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" + AND CMAKE_OSX_ARCHITECTURES MATCHES "^(x86_64|arm64|)$") set(MimerSQL_library_hints "/usr/local/lib") set(MimerSQL_include_dir_hints "/usr/local/include") else()