diff --git a/ports/fastcdr/portfile.cmake b/ports/fastcdr/portfile.cmake index 7427220fcb..0f448c8fbc 100644 --- a/ports/fastcdr/portfile.cmake +++ b/ports/fastcdr/portfile.cmake @@ -1,8 +1,10 @@ +vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eProsima/Fast-CDR - REF v1.0.25 - SHA512 6a20e8ba61fb516fce35bb27f02db8fb45f287bfd49574dcb39e149e6edde0b4d0598f00399a4d0557ca1f6133d96a6701d6475cbd9039879cddb5089b0ef447 + REF v${VERSION} + SHA512 6b31e9ba2f7fe719eb4ac7af59a34cdff1c0d13ed40340d8bea8bfa477c0ffe080f4d6c73096add62f3b20af5fbf8ee8bde288dd9074bfb094b5b355016184f2 HEAD_REF master PATCHES pdb-file.patch @@ -20,10 +22,9 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/lib/fastcdr ${CURRENT_PACKAGES_DIR}/debug/lib/fastcdr) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fastcdr/eProsima_auto_link.h" "#define EPROSIMA_LIB_PREFIX \"lib\"" "#define EPROSIMA_LIB_PREFIX") -else() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fastcdr/config.h" "#define _FASTCDR_CONFIG_H_" "#define _FASTCDR_CONFIG_H_\r\n#define FASTCDR_DYN_LINK") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fastcdr/eProsima_auto_link.h" "(defined(_DLL) || defined(_RTLDLL)) && defined(EPROSIMA_DYN_LINK)" "1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fastcdr/fastcdr_dll.h" "defined(FASTCDR_DYN_LINK)" "1") endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/fastcdr/vcpkg.json b/ports/fastcdr/vcpkg.json index c799948357..374d94dc00 100644 --- a/ports/fastcdr/vcpkg.json +++ b/ports/fastcdr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fastcdr", - "version-semver": "1.0.25", + "version-semver": "1.0.26", "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 b530ce5652..d03306a571 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2285,7 +2285,7 @@ "port-version": 0 }, "fastcdr": { - "baseline": "1.0.25", + "baseline": "1.0.26", "port-version": 0 }, "fastcgi": { diff --git a/versions/f-/fastcdr.json b/versions/f-/fastcdr.json index f3d1151972..fc462dc58f 100644 --- a/versions/f-/fastcdr.json +++ b/versions/f-/fastcdr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ac25a2de2fa721da695d61b5346f05e93a51bf7", + "version-semver": "1.0.26", + "port-version": 0 + }, { "git-tree": "770f5d0a255b922f7f1ef8c375ef4f13b0111252", "version-semver": "1.0.25",