Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Raise minimum macOS version to 11 (Qt6.5 requirement) and use AVX instruction set #142

Merged
merged 1 commit into from
Apr 9, 2024
Merged

Raise minimum macOS version to 11 (Qt6.5 requirement) and use AVX instruction set #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ jobs:
- os: macos-11
vcpkg_path: /Users/runner/mixxx-vcpkg
vcpkg_bootstrap: ./bootstrap-vcpkg.sh
vcpkg_triplet: x64-osx-min1015
vcpkg_host_triplet: x64-osx-min1015
vcpkg_triplet: x64-osx-min1100
vcpkg_host_triplet: x64-osx-min1100
check_disk_space: df -h
- os: macos-11
vcpkg_path: /Users/runner/mixxx-vcpkg
vcpkg_bootstrap: ./bootstrap-vcpkg.sh
vcpkg_triplet: arm64-osx-min1100-release
vcpkg_host_triplet: x64-osx-min1015-release
vcpkg_host_triplet: x64-osx-min1100-release
check_disk_space: df -h
env:
VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkg_triplet }}
Expand Down
8 changes: 7 additions & 1 deletion ...ay/triplets/x64-osx-min1015-release.cmake → ...ay/triplets/x64-osx-min1100-release.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ endif()
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
set(VCPKG_OSX_ARCHITECTURES x86_64)

set(VCPKG_OSX_DEPLOYMENT_TARGET 10.15)
# Minimum supported macOS version as target platform for Qt6.5 is 11
# https://doc.qt.io/qt-6.5/supported-platforms.html#desktop-platforms
set(VCPKG_OSX_DEPLOYMENT_TARGET 11.0)

# All Apple computer supported by macOS 11, have processors with AVX instruction set
set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -mavx")
set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -mavx")

set(VCPKG_BUILD_TYPE release)
7 changes: 6 additions & 1 deletion overlay/triplets/x64-osx-min1015.cmake → overlay/triplets/x64-osx-min1100.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,10 @@ endif()
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
set(VCPKG_OSX_ARCHITECTURES x86_64)

set(VCPKG_OSX_DEPLOYMENT_TARGET 10.15)
# Minimum supported macOS version as target platform for Qt6.5 is 11
# https://doc.qt.io/qt-6.5/supported-platforms.html#desktop-platforms
set(VCPKG_OSX_DEPLOYMENT_TARGET 11.0)

# All Apple computer supported by macOS 11, have processors with AVX instruction set
set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -mavx")
set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -mavx")
Loading