Compare commits

..

2 Commits

Author SHA1 Message Date
William Bell
b905026010 fix rosetta not used 2025-08-16 04:31:21 +01:00
William Bell
677afd9433 fix using Rosetta 2025-08-16 04:10:57 +01:00

View File

@@ -76,7 +76,11 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install conan
if [ "${{ matrix.arch }}" = "x86_64" ] && [ "$(uname -m)" = "arm64" ]; then
arch -x86_64 conan profile detect
else
conan profile detect
fi
- name: Build
run: |
@@ -84,12 +88,18 @@ jobs:
mkdir -p "$BUILD_DIR"
cd "$BUILD_DIR"
# Pass architecture explicitly to CMake via environment
export CMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}"
# Run Conan install/build
# Use Rosetta for x86_64 builds on Apple Silicon
if [ "${{ matrix.arch }}" = "x86_64" ] && [ "$(uname -m)" = "arm64" ]; then
arch -x86_64 bash -c "
export CMAKE_OSX_ARCHITECTURES=x86_64
conan install .. --build=missing
conan build ..
"
else
export CMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}"
conan install .. --build=missing
conan build ..
fi
cd ..