From f0c09d91b32b55ed5c97911e7387e32c5e39a171 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Fri, 29 Mar 2024 16:27:35 +0100 Subject: [PATCH 1/2] Raise macOS target version to 11 (Qt6.5 requirement). Raised processor instruction set to AVX, because all macOS 11 supported Apple models have AVX. --- .github/workflows/build.yml | 6 +++--- ...in1015-release.cmake => x64-osx-min1100-release.cmake} | 8 +++++++- .../{x64-osx-min1015.cmake => x64-osx-min1100.cmake} | 7 ++++++- 3 files changed, 16 insertions(+), 5 deletions(-) rename overlay/triplets/{x64-osx-min1015-release.cmake => x64-osx-min1100-release.cmake} (58%) rename overlay/triplets/{x64-osx-min1015.cmake => x64-osx-min1100.cmake} (56%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1ca6b67c7a14d..e74f93c365fc5a 100644 --- 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/overlay/triplets/x64-osx-min1015-release.cmake b/overlay/triplets/x64-osx-min1100-release.cmake similarity index 58% rename from overlay/triplets/x64-osx-min1015-release.cmake rename to overlay/triplets/x64-osx-min1100-release.cmake index 242c321f79ea5d..c863700901e6ae 100644 --- a/overlay/triplets/x64-osx-min1015-release.cmake +++ b/overlay/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 b/overlay/triplets/x64-osx-min1100.cmake similarity index 56% rename from overlay/triplets/x64-osx-min1015.cmake rename to overlay/triplets/x64-osx-min1100.cmake index 7a704d187461e5..196782d4f89353 100644 --- a/overlay/triplets/x64-osx-min1015.cmake +++ b/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") From 875f13bfb5a077b7631d7310788238b7c2e4fe9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Mon, 15 Apr 2024 20:07:23 +0200 Subject: [PATCH 2/2] Update cmake to 2.29.2 to work around https://github.com/microsoft/vcpkg/issues/37968 --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e74f93c365fc5a..d2ac690bba58f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,6 +72,12 @@ jobs: run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT working-directory: ${{ matrix.vcpkg_path }} + # update cmake to 2.29.2 to work around https://github.com/microsoft/vcpkg/issues/37968 + - name: "[macOS] Set up cmake" + uses: jwlawson/actions-setup-cmake@v2.0 + with: + cmake-version: "3.29.2" + - name: Bootstrap vcpkg run: ${{ matrix.vcpkg_bootstrap }} working-directory: ${{ matrix.vcpkg_path }}