From da12ca23390448accddebedb60a62baad42ccb4b Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Tue, 18 Jun 2024 11:59:11 -0700 Subject: [PATCH] [fastcdr] Update to 2.2.1 (#39336) --- ports/fastcdr/pdb-file.patch | 18 +++++++++--------- ports/fastcdr/portfile.cmake | 6 ++---- ports/fastcdr/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fastcdr.json | 5 +++++ 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/ports/fastcdr/pdb-file.patch b/ports/fastcdr/pdb-file.patch index 94b307e99e..03306a1b76 100644 --- a/ports/fastcdr/pdb-file.patch +++ b/ports/fastcdr/pdb-file.patch @@ -1,13 +1,13 @@ diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt -index da35d03..343f038 100644 +index 7ac643b..a70750d 100644 --- a/src/cpp/CMakeLists.txt +++ b/src/cpp/CMakeLists.txt -@@ -195,7 +195,7 @@ elseif(NOT EPROSIMA_INSTALLER) - endif() +@@ -158,7 +158,7 @@ if(MSVC OR MSVC_IDE) + endif() - # install symbols if any -- if(PDB_FILE) -+ if(PDB_FILE AND BUILD_SHARED_LIBS) - install(FILES ${PDB_FILE} - DESTINATION ${LIB_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION} - COMPONENT symbols + # install symbols if any +- if(PDB_FILE) ++ if(PDB_FILE AND BUILD_SHARED_LIBS) + install(FILES ${PDB_FILE} + DESTINATION ${LIB_INSTALL_DIR} + COMPONENT symbols diff --git a/ports/fastcdr/portfile.cmake b/ports/fastcdr/portfile.cmake index 26ce8589f1..f91b6e4fe9 100644 --- a/ports/fastcdr/portfile.cmake +++ b/ports/fastcdr/portfile.cmake @@ -1,10 +1,8 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eProsima/Fast-CDR - REF v${VERSION} - SHA512 66040acb563d7c06efb67a1536eb178183776e71a6b54c7e02efbe50ff0926aa24d87fb7869273e985c5c0f2b5d1496d3b1a20f10358373c73171b51c71e7e6a + REF "v${VERSION}" + SHA512 4e3b39f371393e2be2b2a33cba1284f5eef9dea3e27ec8904db3f90b88b04aefbec2f095c078c7f4975bef4a7fb4a0dd53236636c4353a40378172559313f5c7 HEAD_REF master PATCHES pdb-file.patch diff --git a/ports/fastcdr/vcpkg.json b/ports/fastcdr/vcpkg.json index 6e21acc09f..a7bf69ceaf 100644 --- a/ports/fastcdr/vcpkg.json +++ b/ports/fastcdr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fastcdr", - "version-semver": "1.1.0", + "version-semver": "2.2.1", "description": "eProsima FastCDR is a C++ library that provides two serialization mechanisms. One is the standard CDR serialization mechanism, while the other is a faster implementation that modifies the standard.", "homepage": "https://github.com/eProsima/Fast-CDR", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index b2fee0a8f7..72791484f1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2621,7 +2621,7 @@ "port-version": 0 }, "fastcdr": { - "baseline": "1.1.0", + "baseline": "2.2.1", "port-version": 0 }, "fastcgi": { diff --git a/versions/f-/fastcdr.json b/versions/f-/fastcdr.json index f0a793ccf4..b557d6f824 100644 --- a/versions/f-/fastcdr.json +++ b/versions/f-/fastcdr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d1487d4af6d136031c30effdcabb6c9e0a1738a", + "version-semver": "2.2.1", + "port-version": 0 + }, { "git-tree": "9f8b9c01af9c5166bc7666ca9aac688747ff7a03", "version-semver": "1.1.0",