From 6c1d37e8ce8ff93c6fa12acdcf2d418fe4cb1cfa Mon Sep 17 00:00:00 2001 From: Tal Regev Date: Wed, 7 Feb 2024 22:23:31 +0200 Subject: [PATCH] ignition-msgs5 v5.1.0#1 --- .github/workflows/linux-config/action.yml | 2 +- deps/vcpkg/manifest/vcpkg.json | 5 +++++ deps/vcpkg/triplets/x64-linux-release.cmake | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux-config/action.yml b/.github/workflows/linux-config/action.yml index 801cca5bdc..be5e9505ca 100644 --- a/.github/workflows/linux-config/action.yml +++ b/.github/workflows/linux-config/action.yml @@ -8,7 +8,7 @@ runs: uses: actions/cache@v3 with: path: deps/vcpkg/cache/linux - key: linux-x64-${{ hashFiles('.github/workflows/linux-config/action.yml', 'deps/vcpkg/manifest/vcpkg.json') }} + key: linux-x64-${{ hashFiles('.github/workflows/linux-config/action.yml', 'deps/vcpkg/manifest/vcpkg.json', 'deps/vcpkg/triplets/x64-linux-release.cmake') }} - name: Install dependencies shell: bash diff --git a/deps/vcpkg/manifest/vcpkg.json b/deps/vcpkg/manifest/vcpkg.json index 4d6935184a..e7fd582b18 100644 --- a/deps/vcpkg/manifest/vcpkg.json +++ b/deps/vcpkg/manifest/vcpkg.json @@ -146,6 +146,11 @@ { "name": "qwt", "version": "6.1.5" + }, + { + "name": "ignition-msgs5", + "version": "5.1.0", + "port-version": 1 } ] } diff --git a/deps/vcpkg/triplets/x64-linux-release.cmake b/deps/vcpkg/triplets/x64-linux-release.cmake index d7f3e2b25f..93ffb6dd98 100644 --- a/deps/vcpkg/triplets/x64-linux-release.cmake +++ b/deps/vcpkg/triplets/x64-linux-release.cmake @@ -4,3 +4,7 @@ set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Linux) set(VCPKG_BUILD_TYPE release) + +if(PORT STREQUAL "ffmpeg") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif()