Merge pull request microsoft#142 from JoergAtGithub/macOS11_AVX

Raise minimum macOS version to 11 (Qt6.5 requirement) and use AVX instruction set
xsco · Apr 9, 2024 · 0d6dec6 · 0d6dec6
2 parents 05f33a4 + f0c09d9
commit 0d6dec6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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 }}

diff --git a/...ay/triplets/x64-osx-min1015-release.cmake → ...ay/triplets/x64-osx-min1100-release.cmake b/...ay/triplets/x64-osx-min1015-release.cmake → ...ay/triplets/x64-osx-min1100-release.cmake
@@ -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)
diff --git a/overlay/triplets/x64-osx-min1015.cmake → overlay/triplets/x64-osx-min1100.cmake b/overlay/triplets/x64-osx-min1015.cmake → overlay/triplets/x64-osx-min1100.cmake
@@ -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")