aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>2021-04-08 03:30:16 +0800
committerGitHub <noreply@github.com>2021-04-07 12:30:16 -0700
commitc9ab7da4d468d877bc2edf489cbe9c8d14fc4053 (patch)
treeddd00543d8196bbef1758452e076550a2b1ac672
parent88e03109aae553fe35c850a20b0fcd6888654664 (diff)
downloadvcpkg-c9ab7da4d468d877bc2edf489cbe9c8d14fc4053.tar.gz
vcpkg-c9ab7da4d468d877bc2edf489cbe9c8d14fc4053.zip
[fastcdr] Fix support Linux (#17112)
* [fastcdr] Fix support Linux * Format json and update versions * Update versions/f-/fastcdr.json
-rw-r--r--ports/fastcdr/CONTROL5
-rw-r--r--ports/fastcdr/portfile.cmake4
-rw-r--r--ports/fastcdr/vcpkg.json7
-rw-r--r--scripts/ci.baseline.txt1
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/f-/fastcdr.json5
6 files changed, 14 insertions, 10 deletions
diff --git a/ports/fastcdr/CONTROL b/ports/fastcdr/CONTROL
deleted file mode 100644
index 87775a41a..000000000
--- a/ports/fastcdr/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: fastcdr
-Version: 1.0.15
-Homepage: https://github.com/eProsima/Fast-CDR
-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.
-Supports: !linux
diff --git a/ports/fastcdr/portfile.cmake b/ports/fastcdr/portfile.cmake
index cfb26720a..1bd5034a7 100644
--- a/ports/fastcdr/portfile.cmake
+++ b/ports/fastcdr/portfile.cmake
@@ -1,5 +1,3 @@
-vcpkg_fail_port_install(ON_TARGET "linux")
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO eProsima/Fast-CDR
@@ -35,4 +33,4 @@ else()
file(WRITE ${CURRENT_PACKAGES_DIR}/include/fastcdr/config.h "${FASTCDR_H}")
endif()
-file(INSTALL ${SOURCE_PATH}/license DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/fastcdr/vcpkg.json b/ports/fastcdr/vcpkg.json
new file mode 100644
index 000000000..0f2241e4e
--- /dev/null
+++ b/ports/fastcdr/vcpkg.json
@@ -0,0 +1,7 @@
+{
+ "name": "fastcdr",
+ "version-semver": "1.0.15",
+ "port-version": 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"
+}
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 124afea57..1412a023a 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -297,7 +297,6 @@ farmhash:x64-windows-static=fail
farmhash:x64-windows-static-md=fail
farmhash:x86-windows=fail
fastrtps:arm-uwp=fail
-fastrtps:x64-linux=fail
fastrtps:x64-uwp=fail
fastrtps:x64-windows-static=fail
fastrtps:x64-windows-static-md=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index a28e6ae27..b15e28162 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1898,7 +1898,7 @@
},
"fastcdr": {
"baseline": "1.0.15",
- "port-version": 0
+ "port-version": 1
},
"fastcgi": {
"baseline": "2020-09-11",
diff --git a/versions/f-/fastcdr.json b/versions/f-/fastcdr.json
index 87de4ed5a..6a8cb5af3 100644
--- a/versions/f-/fastcdr.json
+++ b/versions/f-/fastcdr.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "d44198a7b4b57e8f66b4c3ce6b4877066a4a8bf2",
+ "version-semver": "1.0.15",
+ "port-version": 1
+ },
+ {
"git-tree": "2737f3f6c1cb3e6d652f474740726eb93f4e420a",
"version-string": "1.0.15",
"port-version": 0