diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f6f6029d5222e4..bad8018ca71b62 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,15 +23,15 @@ jobs: vcpkg_path: /Users/runner/mixxx-vcpkg vcpkg_buildtrees-root: /Users/runner/mixxx-vcpkg/buildtrees vcpkg_bootstrap: ./bootstrap-vcpkg.sh - vcpkg_triplet: x64-osx-min1015-release - vcpkg_host_triplet: x64-osx-min1015-release + vcpkg_triplet: x64-osx-min1100-release + vcpkg_host_triplet: x64-osx-min1100-release check_disk_space: df -h - os: macos-11 vcpkg_path: /Users/runner/mixxx-vcpkg vcpkg_buildtrees-root: /Users/runner/mixxx-vcpkg/buildtrees 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 }} @@ -75,6 +75,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 }} diff --git a/overlay/triplets/x64-osx-min1015-release.cmake b/overlay/triplets/arm64-osx-min1100.cmake similarity index 73% rename from overlay/triplets/x64-osx-min1015-release.cmake rename to overlay/triplets/arm64-osx-min1100.cmake index 242c321f79ea5d..a7caf89a32589c 100644 --- a/overlay/triplets/x64-osx-min1015-release.cmake +++ b/overlay/triplets/arm64-osx-min1100.cmake @@ -1,4 +1,4 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE dynamic) # Mixxx loads fdk-aac dynamically at runtime. This allows the user to replace @@ -11,8 +11,7 @@ else() endif() set(VCPKG_CMAKE_SYSTEM_NAME Darwin) -set(VCPKG_OSX_ARCHITECTURES x86_64) +set(VCPKG_OSX_ARCHITECTURES arm64) -set(VCPKG_OSX_DEPLOYMENT_TARGET 10.15) +set(VCPKG_OSX_DEPLOYMENT_TARGET 11.0) -set(VCPKG_BUILD_TYPE release) diff --git a/overlay/triplets/x64-osx-min1100-release.cmake b/overlay/triplets/x64-osx-min1100-release.cmake new file mode 100644 index 00000000000000..c863700901e6ae --- /dev/null +++ b/overlay/triplets/x64-osx-min1100-release.cmake @@ -0,0 +1,24 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) + +# Mixxx loads fdk-aac dynamically at runtime. This allows the user to replace +# the version of fdk-aac we ship which has the patent-encumbered HE-AAC +#removed with another build that supports HE-AAC. +if(${PORT} MATCHES "fdk-aac") + set(VCPKG_LIBRARY_LINKAGE dynamic) +else() + set(VCPKG_LIBRARY_LINKAGE static) +endif() + +set(VCPKG_CMAKE_SYSTEM_NAME Darwin) +set(VCPKG_OSX_ARCHITECTURES x86_64) + +# 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-min1100.cmake b/overlay/triplets/x64-osx-min1100.cmake new file mode 100644 index 00000000000000..196782d4f89353 --- /dev/null +++ b/overlay/triplets/x64-osx-min1100.cmake @@ -0,0 +1,22 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) + +# Mixxx loads fdk-aac dynamically at runtime. This allows the user to replace +# the version of fdk-aac we ship which has the patent-encumbered HE-AAC +#removed with another build that supports HE-AAC. +if(${PORT} MATCHES "fdk-aac") + set(VCPKG_LIBRARY_LINKAGE dynamic) +else() + set(VCPKG_LIBRARY_LINKAGE static) +endif() + +set(VCPKG_CMAKE_SYSTEM_NAME Darwin) +set(VCPKG_OSX_ARCHITECTURES x86_64) + +# 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")