Skip to content

Commit ae0a14c

Browse files
committed
Merge branch 'main' into autobuild
2 parents 5cb0c7f + 45901b7 commit ae0a14c

File tree

3 files changed

+35
-0
lines changed

3 files changed

+35
-0
lines changed

CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
cmake_minimum_required(VERSION 3.28)
2+
3+
# Set vcpkg triplet for macOS universal binaries
4+
if(APPLE AND NOT DEFINED VCPKG_TARGET_TRIPLET)
5+
set(VCPKG_TARGET_TRIPLET "universal-osx" CACHE STRING "")
6+
set(VCPKG_OVERLAY_TRIPLETS "${CMAKE_CURRENT_SOURCE_DIR}/triplets" CACHE STRING "")
7+
endif()
8+
29
project(EntropyCore
310
VERSION 1.0.0
411
DESCRIPTION "Core utilities and concurrency primitives for Entropy Engine"

triplets/universal-osx.cmake

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Custom triplet for macOS universal binaries (x86_64 + arm64)
2+
set(VCPKG_TARGET_ARCHITECTURE x64)
3+
set(VCPKG_CRT_LINKAGE dynamic)
4+
set(VCPKG_LIBRARY_LINKAGE static)
5+
6+
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
7+
8+
# Build universal binaries with both architectures
9+
set(VCPKG_OSX_ARCHITECTURES "x86_64;arm64")
10+
11+
# Target macOS 13.3 as minimum (required for certain C++ features)
12+
set(VCPKG_OSX_DEPLOYMENT_TARGET "13.3")
13+
14+
# Ensure CMake uses the architectures properly
15+
set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
16+
17+
# Use Release builds for both architectures
18+
if(PORT MATCHES "tracy")
19+
set(VCPKG_BUILD_TYPE release)
20+
endif()

vcpkg-configuration.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"default-registry": {
3+
"kind": "git",
4+
"baseline": "c4af3593e1f1aa9e14a560a09e45ea2cb0dfd74d",
5+
"repository": "https://github.com/microsoft/vcpkg"
6+
},
7+
"overlay-triplets": ["./triplets"]
8+
}

0 commit comments

Comments
 (0)