From 290dfe05c33dc8d3eec8849e202fa1b05629be3b Mon Sep 17 00:00:00 2001
From: Mentalflow <312902918@qq.com>
Date: Thu, 9 May 2024 09:51:26 +0800
Subject: [PATCH] CMakeLists: Simplified macOS universal build code.

---
 CMakeLists.txt            | 4 +++-
 example/CMakeLists.txt    | 4 ----
 lib_source/CMakeLists.txt | 4 ----
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c997ae3..22c04fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,8 +9,9 @@ cmake_path(SET QT_SDK_DIR NORMALIZE ${QT_SDK_DIR})
 option(RIBBONUI_BUILD_EXAMPLES "Build RibbonUI APP." ON)
 option(RIBBONUI_BUILD_QWINDOWKIT "Build QWindowKit." ON)
 option(RIBBONUI_BUILD_STATIC_LIB "Build RibbonUI static library." OFF)
+option(RIBBONUI_UNIVERSAL_BUILD_MACOS "Universal build RibbonUI for macOS." ON)
 
-if(APPLE)
+if(APPLE AND RIBBONUI_UNIVERSAL_BUILD_MACOS)
     set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
 endif()
 
@@ -38,5 +39,6 @@ message("---------------------------- RibbonUI ----------------------------")
 message("Build RibbonUI APP: ${RIBBONUI_BUILD_EXAMPLES}")
 message("Build RibbonUI static library: ${RIBBONUI_BUILD_STATIC_LIB}")
 message("Build QWindowKit: ${RIBBONUI_BUILD_QWINDOWKIT}")
+message("Universal build RibbonUI for macOS: ${RIBBONUI_UNIVERSAL_BUILD_MACOS}")
 message("RibbonUI QML Plugin Path: ${RIBBONUI_QML_PLUGIN_DIRECTORY}")
 message("------------------------------------------------------------------")
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index 83e482c..a0f15ab 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -15,10 +15,6 @@ else()
     set(CMAKE_AUTOUIC ON)
 endif()
 
-if(APPLE)
-    set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
-endif()
-
 string(TIMESTAMP TIME_YEAR %Y)
 set(PROJECT_COMPANY "Mentalflow's Lab")
 set(PROJECT_COPYRIGHT "Copyright (c) ${TIME_YEAR} Mentalflow's Lab. All rights reserved.")
diff --git a/lib_source/CMakeLists.txt b/lib_source/CMakeLists.txt
index d1e274b..5c09ffa 100644
--- a/lib_source/CMakeLists.txt
+++ b/lib_source/CMakeLists.txt
@@ -16,10 +16,6 @@ else()
     set(CMAKE_AUTOUIC ON)
 endif()
 
-if(APPLE)
-    set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
-endif()
-
 find_package(Qt6 COMPONENTS Core Quick Qml REQUIRED)
 
 set(version_str "${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH}")