From 3499ce53dbb8b245c201d9fe43f12923eee883eb Mon Sep 17 00:00:00 2001 From: fwcd Date: Thu, 9 Nov 2023 22:24:26 +0000 Subject: [PATCH] Add release-mode triplet for x64-linux Building debug symbols causes CI to fail due to a lack of space. Unfortunately, this workaround is still needed: https://github.com/microsoft/vcpkg/issues/10683 --- .github/workflows/build.yml | 2 +- overlay/triplets/x64-linux.cmake | 7 +++++++ vars/vcpkg.sh | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 overlay/triplets/x64-linux.cmake diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4aa81e7..59ae550 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: ARTIFACT_BASE_NAME: 'mixxx-${{ matrix.triplet }}' VCPKG_DEFAULT_TRIPLET: '${{ matrix.triplet }}' VCPKG_DEFAULT_HOST_TRIPLET: '${{ matrix.host_triplet }}' - VCPKG_OVERLAY_TRIPLETS: vcpkg/overlay/triplets + VCPKG_OVERLAY_TRIPLETS: overlay/triplets:vcpkg/overlay/triplets VCPKG_OVERLAY_PORTS: '${{ matrix.overlay_ports }}' VCPKG_ROOT: ${{ github.workspace }}/vcpkg MIXXX_ROOT: ${{ github.workspace }}/mixxx diff --git a/overlay/triplets/x64-linux.cmake b/overlay/triplets/x64-linux.cmake new file mode 100644 index 0000000..8a25c72 --- /dev/null +++ b/overlay/triplets/x64-linux.cmake @@ -0,0 +1,7 @@ +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/vars/vcpkg.sh b/vars/vcpkg.sh index b6a2446..29bd905 100644 --- a/vars/vcpkg.sh +++ b/vars/vcpkg.sh @@ -4,5 +4,5 @@ if [ -z "$VCPKG_ROOT" ]; then export VCPKG_ROOT="$rootdir/vcpkg" fi -export VCPKG_OVERLAY_TRIPLETS="$VCPKG_ROOT/overlay/triplets" +export VCPKG_OVERLAY_TRIPLETS="$rootdir/overlay/triplets:$VCPKG_ROOT/overlay/triplets" export VCPKG_OVERLAY_PORTS="$VCPKG_ROOT/overlay/osx:$VCPKG_ROOT/overlay/ports"