From b938ac449f3a2696063fdc83c6da277e4088a120 Mon Sep 17 00:00:00 2001 From: sukibaby <163092272+sukibaby@users.noreply.github.com> Date: Thu, 8 Aug 2024 19:23:48 -0700 Subject: [PATCH] Migrate to universal build for macOS Instruct cmake to generate a universal release, instead of separate executables for ARM64 and x86_64. --- Utils/build-release-macos.sh | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Utils/build-release-macos.sh b/Utils/build-release-macos.sh index 5bb93acfa2..d0d2b1fa48 100755 --- a/Utils/build-release-macos.sh +++ b/Utils/build-release-macos.sh @@ -3,14 +3,10 @@ set -eux cd "$(dirname $0)/.." -cmake -B Build/release-arm64 -DCMAKE_BUILD_TYPE=Release -DWITH_FULL_RELEASE=On -DCMAKE_OSX_ARCHITECTURES=arm64 -DWITH_CLUB_FANTASTIC=On -cmake --build Build/release-arm64 -j $(sysctl -n hw.logicalcpu) -cmake --build Build/release-arm64 --target package -cmake -B Build/release-arm64 -DCMAKE_BUILD_TYPE=Release -DWITH_FULL_RELEASE=On -DCMAKE_OSX_ARCHITECTURES=arm64 -DWITH_CLUB_FANTASTIC=Off -cmake --build Build/release-arm64 --target package +cmake -B Build/release-universal -DCMAKE_BUILD_TYPE=Release -DWITH_FULL_RELEASE=On -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DWITH_CLUB_FANTASTIC=On +cmake --build Build/release-universal -j $(sysctl -n hw.logicalcpu) +cmake --build Build/release-universal --target package -cmake -B Build/release-x86_64 -DCMAKE_BUILD_TYPE=Release -DWITH_FULL_RELEASE=On -DCMAKE_OSX_ARCHITECTURES=x86_64 -DWITH_CLUB_FANTASTIC=On -cmake --build Build/release-x86_64 -j $(sysctl -n hw.logicalcpu) -cmake --build Build/release-x86_64 --target package -cmake -B Build/release-x86_64 -DCMAKE_BUILD_TYPE=Release -DWITH_FULL_RELEASE=On -DCMAKE_OSX_ARCHITECTURES=x86_64 -DWITH_CLUB_FANTASTIC=Off -cmake --build Build/release-x86_64 --target package +cmake -B Build/release-universal -DCMAKE_BUILD_TYPE=Release -DWITH_FULL_RELEASE=On -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DWITH_CLUB_FANTASTIC=Off +cmake --build Build/release-universal -j $(sysctl -n hw.logicalcpu) +cmake --build Build/release-universal --target package