From 979a9882bc9fa22d6f3ffca158e846161e301318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Tue, 14 Nov 2023 23:25:35 +0100 Subject: [PATCH] Append -release to release triplets like upstream to have no name conflict --- .github/workflows/build.yml | 12 ++++++------ ...00.cmake => arm64-osx-min1100-release.cmake} | 0 overlay/triplets/arm64-osx.cmake | 17 ----------------- ...1012.cmake => x64-osx-min1012-release.cmake} | 0 overlay/triplets/x64-windows.cmake | 12 ------------ 5 files changed, 6 insertions(+), 35 deletions(-) rename overlay/triplets/{arm64-osx-min1100.cmake => arm64-osx-min1100-release.cmake} (100%) delete mode 100644 overlay/triplets/arm64-osx.cmake rename overlay/triplets/{x64-osx-min1012.cmake => x64-osx-min1012-release.cmake} (100%) delete mode 100644 overlay/triplets/x64-windows.cmake diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e80fbe1160217c..93bdea91c6a585 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,16 +11,16 @@ jobs: - os: windows-2019 vcpkg_path: D:\mixxx-vcpkg vcpkg_bootstrap: .\bootstrap-vcpkg.bat - vcpkg_triplet: x64-windows - vcpkg_host_triplet: x64-windows + vcpkg_triplet: x64-windows-release + vcpkg_host_triplet: x64-windows-release vcpkg_overlay_ports: overlay/windows;overlay/ports vcpkg_packages_extras: angle libid3tag libmad qt5-winextras check_disk_space: Get-PSDrive - os: macos-11 vcpkg_path: /Users/runner/mixxx-vcpkg vcpkg_bootstrap: ./bootstrap-vcpkg.sh - vcpkg_triplet: x64-osx-min1012 - vcpkg_host_triplet: x64-osx-min1012 + vcpkg_triplet: x64-osx-min1012-release + vcpkg_host_triplet: x64-osx-min1012-release vcpkg_overlay_ports: overlay/osx:overlay/ports vcpkg_packages_extras: qt5-macextras vcpkg_cache: /Users/runner/.cache/vcpkg/archives @@ -28,8 +28,8 @@ jobs: - os: macos-11 vcpkg_path: /Users/runner/mixxx-vcpkg vcpkg_bootstrap: ./bootstrap-vcpkg.sh - vcpkg_triplet: arm64-osx-min1100 - vcpkg_host_triplet: x64-osx-min1012 + vcpkg_triplet: arm64-osx-min1100-release + vcpkg_host_triplet: x64-osx-min1012-release vcpkg_overlay_ports: overlay/osx:overlay/ports vcpkg_packages_extras: qt5-macextras vcpkg_cache: /Users/runner/.cache/vcpkg/archives diff --git a/overlay/triplets/arm64-osx-min1100.cmake b/overlay/triplets/arm64-osx-min1100-release.cmake similarity index 100% rename from overlay/triplets/arm64-osx-min1100.cmake rename to overlay/triplets/arm64-osx-min1100-release.cmake diff --git a/overlay/triplets/arm64-osx.cmake b/overlay/triplets/arm64-osx.cmake deleted file mode 100644 index 93500faf974b84..00000000000000 --- a/overlay/triplets/arm64-osx.cmake +++ /dev/null @@ -1,17 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE arm64) -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 arm64) -set(VCPKG_OSX_DEPLOYMENT_TARGET 11.0) - -set(VCPKG_BUILD_TYPE release) diff --git a/overlay/triplets/x64-osx-min1012.cmake b/overlay/triplets/x64-osx-min1012-release.cmake similarity index 100% rename from overlay/triplets/x64-osx-min1012.cmake rename to overlay/triplets/x64-osx-min1012-release.cmake diff --git a/overlay/triplets/x64-windows.cmake b/overlay/triplets/x64-windows.cmake deleted file mode 100644 index 8b74a6c4571eeb..00000000000000 --- a/overlay/triplets/x64-windows.cmake +++ /dev/null @@ -1,12 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) - -# DjInterop has not yet a stable API. We link it statically to allow running -# experimental Mixxx build without conflicts -if(${PORT} MATCHES "libdjinterop") - set(VCPKG_LIBRARY_LINKAGE static) -else() - set(VCPKG_LIBRARY_LINKAGE dynamic) -endif() - -set(VCPKG_BUILD_TYPE release)