From 18eeb5b27399153045a16c5c6a730d9b74dd5db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Tue, 14 Nov 2023 23:13:55 +0100 Subject: [PATCH] Append -release to release triplets like upstream to have no name conflict --- .github/workflows/build.yml | 12 ++++++------ ...min1100.cmake => arm64-osx-min1100-release.cmake} | 0 overlay/triplets/x64-linux.cmake | 7 ------- ...x-min1015.cmake => x64-osx-min1015-release.cmake} | 0 overlay/triplets/x64-windows.cmake | 5 ----- 5 files changed, 6 insertions(+), 18 deletions(-) rename overlay/triplets/{arm64-osx-min1100.cmake => arm64-osx-min1100-release.cmake} (100%) delete mode 100644 overlay/triplets/x64-linux.cmake rename overlay/triplets/{x64-osx-min1015.cmake => x64-osx-min1015-release.cmake} (100%) delete mode 100644 overlay/triplets/x64-windows.cmake diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5991f94e1f61a1..eea40e5184e468 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,8 +12,8 @@ jobs: vcpkg_path: C:\mixxx-vcpkg vcpkg_buildtrees-root: C:\build 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: libid3tag libmad check_disk_space: Get-PSDrive @@ -21,8 +21,8 @@ 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 - vcpkg_host_triplet: x64-osx-min1015 + vcpkg_triplet: x64-osx-min1015-release + vcpkg_host_triplet: x64-osx-min1015-release vcpkg_overlay_ports: overlay/osx:overlay/ports vcpkg_packages_extras: check_disk_space: df -h @@ -30,8 +30,8 @@ jobs: vcpkg_path: /Users/runner/mixxx-vcpkg vcpkg_buildtrees-root: /Users/runner/mixxx-vcpkg/buildtrees vcpkg_bootstrap: ./bootstrap-vcpkg.sh - vcpkg_triplet: arm64-osx-min1100 - vcpkg_host_triplet: x64-osx-min1015 + vcpkg_triplet: arm64-osx-min1100-release + vcpkg_host_triplet: x64-osx-min1015-release vcpkg_overlay_ports: overlay/osx:overlay/ports vcpkg_packages_extras: check_disk_space: df -h 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/x64-linux.cmake b/overlay/triplets/x64-linux.cmake deleted file mode 100644 index 8a25c72e1e89ae..00000000000000 --- a/overlay/triplets/x64-linux.cmake +++ /dev/null @@ -1,7 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) - -set(VCPKG_CMAKE_SYSTEM_NAME Linux) - -set(VCPKG_BUILD_TYPE release) diff --git a/overlay/triplets/x64-osx-min1015.cmake b/overlay/triplets/x64-osx-min1015-release.cmake similarity index 100% rename from overlay/triplets/x64-osx-min1015.cmake rename to overlay/triplets/x64-osx-min1015-release.cmake diff --git a/overlay/triplets/x64-windows.cmake b/overlay/triplets/x64-windows.cmake deleted file mode 100644 index 1ae9006118fb33..00000000000000 --- a/overlay/triplets/x64-windows.cmake +++ /dev/null @@ -1,5 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) - -set(VCPKG_BUILD_TYPE release)