From 0948417d098cff3736f63112919e922bf5f82ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 16 Dec 2021 23:40:15 +0100 Subject: [PATCH] Update to latest vcpkg build Also set VCPKG_TARGET_TRIPLET and VCPKG_DEFAULT_HOST_TRIPLET to x64-osx-min10.12 this is required for the new environment and also prevents to go to crosscompile mode --- .github/workflows/build.yml | 2 ++ packaging/macos/build_environment | 4 ++-- packaging/windows/build_environment | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1ae8d2a945c4..cf51553c054c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,6 +61,8 @@ jobs: -DMACOS_BUNDLE=ON -DMODPLUG=OFF -DWAVPACK=OFF + -DVCPKG_TARGET_TRIPLET=x64-osx-min10.12 + -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min10.12 # TODO: Fix this broken test on macOS ctest_args: --exclude-regex DirectoryDAOTest.relocateDirectory cpack_generator: DragNDrop diff --git a/packaging/macos/build_environment b/packaging/macos/build_environment index 0abbc386f60a..8c317ad478c0 100644 --- a/packaging/macos/build_environment +++ b/packaging/macos/build_environment @@ -1,2 +1,2 @@ -mixxx-deps-2.4-x64-osx-058063e -4ebfc80e20031bfe52589416a8465a07ef09ef8546a8d41b43c57e2c764a7545 +mixxx-deps-2.4-x64-osx-min10.12-3ede1a3 +afe8113d2ef6b8695610ba51bf7296b31a623f410ab8ee377173ea2214b5cca1 diff --git a/packaging/windows/build_environment b/packaging/windows/build_environment index 8afcbecc26e6..a31cbea7d37d 100644 --- a/packaging/windows/build_environment +++ b/packaging/windows/build_environment @@ -1 +1 @@ -mixxx-deps-2.4-x64-windows-058063e +mixxx-deps-2.4-x64-windows-3ede1a3