From 1e34244d8c237441888ba3a9c59924629b06b511 Mon Sep 17 00:00:00 2001 From: Eidolon <furyhunter600@gmail.com> Date: Mon, 15 Apr 2024 08:01:20 -0500 Subject: [PATCH] Use custom macOS 10.15 triplets for macOS uni build --- scripts/arm64-osx-1015.cmake | 7 +++++++ scripts/make-macos-universal.sh | 8 +++++--- scripts/x64-osx-1015.cmake | 7 +++++++ 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 scripts/arm64-osx-1015.cmake create mode 100644 scripts/x64-osx-1015.cmake diff --git a/scripts/arm64-osx-1015.cmake b/scripts/arm64-osx-1015.cmake new file mode 100644 index 0000000000..224430bc1f --- /dev/null +++ b/scripts/arm64-osx-1015.cmake @@ -0,0 +1,7 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_OSX_DEPLOYMENT_TARGET 10.15) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Darwin) +set(VCPKG_OSX_ARCHITECTURES arm64) diff --git a/scripts/make-macos-universal.sh b/scripts/make-macos-universal.sh index 99b174e217..c611353020 100755 --- a/scripts/make-macos-universal.sh +++ b/scripts/make-macos-universal.sh @@ -1,13 +1,15 @@ -#!/usr/bin/bash +#!/usr/bin/env bash # Makes a fused macOS Universal app bundle in the arm64 release preset dir # Only works if in master branch or in source tarball set -e -cmake --preset ninja-x64_osx_vcpkg-release +rm -rf "build/ninja-x64_osx_vcpkg-release" +rm -rf "build/ninja-arm64_osx_vcpkg-release" +cmake --preset ninja-x64_osx_vcpkg-release -DVCPKG_OVERLAY_TRIPLETS=scripts/ -DVCPKG_TARGET_TRIPLET=x64-osx-1015 cmake --build --preset ninja-x64_osx_vcpkg-release -cmake --preset ninja-arm64_osx_vcpkg-release +cmake --preset ninja-arm64_osx_vcpkg-release -DVCPKG_OVERLAY_TRIPLETS=scripts/ -DVCPKG_TARGET_TRIPLET=arm64-osx-1015 cmake --build --preset ninja-arm64_osx_vcpkg-release mkdir -p build/dist diff --git a/scripts/x64-osx-1015.cmake b/scripts/x64-osx-1015.cmake new file mode 100644 index 0000000000..5f0c7b66e0 --- /dev/null +++ b/scripts/x64-osx-1015.cmake @@ -0,0 +1,7 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_OSX_DEPLOYMENT_TARGET 10.15) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Darwin) +set(VCPKG_OSX_ARCHITECTURES x86_64) -- GitLab