aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/bitserializer-rapidyaml/vcpkg.json4
-rw-r--r--ports/bitserializer/portfile.cmake10
-rw-r--r--ports/bitserializer/vcpkg.json20
-rw-r--r--scripts/ci.baseline.txt2
-rw-r--r--versions/b-/bitserializer-rapidyaml.json5
-rw-r--r--versions/b-/bitserializer.json5
-rw-r--r--versions/baseline.json6
7 files changed, 32 insertions, 20 deletions
diff --git a/ports/bitserializer-rapidyaml/vcpkg.json b/ports/bitserializer-rapidyaml/vcpkg.json
index 590519df0..c6fc4961e 100644
--- a/ports/bitserializer-rapidyaml/vcpkg.json
+++ b/ports/bitserializer-rapidyaml/vcpkg.json
@@ -1,9 +1,9 @@
{
"name": "bitserializer-rapidyaml",
"version-string": "alias",
- "port-version": 1,
+ "port-version": 2,
"description": "Deprecated alias for bitserializer-rapidyaml",
- "supports": "!(arm | arm64 | osx)",
+ "supports": "!osx",
"dependencies": [
{
"name": "bitserializer",
diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake
index 3b8e4184f..7e0f67a1d 100644
--- a/ports/bitserializer/portfile.cmake
+++ b/ports/bitserializer/portfile.cmake
@@ -1,8 +1,8 @@
vcpkg_from_bitbucket(
OUT_SOURCE_PATH SOURCE_PATH
REPO Pavel_Kisliak/BitSerializer
- REF 0.10
- SHA512 a8a5acf4f9cc83d3090a3b06efbca682f4e022b5206bc7859ba6738e4d49a7678aa55f431f1721d50b28d8bde126b672396baae27cbaa79f62e3dc237ae678e1
+ REF 0.44
+ SHA512 0629acc93807254bd51d9eed761a92be4780d01604a9ae4bf8a933af70fdb206ea9b4f4db3489805b4163f5071246529ea22f8b3e7fbcd77ed936c3ab24697b2
HEAD_REF master
)
@@ -14,14 +14,14 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
"rapidyaml-archive" BUILD_RAPIDYAML_ARCHIVE
)
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
${FEATURE_OPTIONS}
)
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/bitserializer)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH share/bitserializer)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug)
diff --git a/ports/bitserializer/vcpkg.json b/ports/bitserializer/vcpkg.json
index 7bf83a25e..09a3a8b1b 100644
--- a/ports/bitserializer/vcpkg.json
+++ b/ports/bitserializer/vcpkg.json
@@ -1,13 +1,17 @@
{
"name": "bitserializer",
- "version": "0.10",
- "port-version": 2,
- "description": "Core part of C++ 17 library for serialization to JSON, XML, YAML",
+ "version": "0.44",
+ "description": "C++ 17 library for serialization to JSON, XML, YAML",
"homepage": "https://bitbucket.org/Pavel_Kisliak/bitserializer",
- "default-features": [
- "cpprestjson-archive",
- "pugixml-archive",
- "rapidjson-archive"
+ "dependencies": [
+ {
+ "name": "vcpkg-cmake",
+ "host": true
+ },
+ {
+ "name": "vcpkg-cmake-config",
+ "host": true
+ }
],
"features": {
"cpprestjson-archive": {
@@ -33,7 +37,7 @@
"dependencies": [
{
"name": "ryml",
- "platform": "!arm & !arm64 & !osx"
+ "platform": "!osx"
}
]
}
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 7d954810b..7658ee420 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -55,8 +55,6 @@ aubio:x64-uwp=fail
# broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937
bde:x64-linux=fail
bitserializer:x64-osx=fail
-bitserializer:arm64-windows=fail
-bitserializer:arm-uwp=fail
blend2d:arm64-windows=fail
blend2d:arm-uwp=fail
blend2d:x64-uwp=fail
diff --git a/versions/b-/bitserializer-rapidyaml.json b/versions/b-/bitserializer-rapidyaml.json
index 0b0fe0398..da58b49d7 100644
--- a/versions/b-/bitserializer-rapidyaml.json
+++ b/versions/b-/bitserializer-rapidyaml.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "08097fe26fb2b85b77ee6df81ba666201b1dd991",
+ "version-string": "alias",
+ "port-version": 2
+ },
+ {
"git-tree": "7680ebf3a5a68b67ce532cb52faae1c37535c69a",
"version-string": "alias",
"port-version": 1
diff --git a/versions/b-/bitserializer.json b/versions/b-/bitserializer.json
index 15487c81d..a58466de1 100644
--- a/versions/b-/bitserializer.json
+++ b/versions/b-/bitserializer.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "66c9246073510ab554418a0b63ef9ee471b05b76",
+ "version": "0.44",
+ "port-version": 0
+ },
+ {
"git-tree": "ea63e330fbf462f7d5ab3fa119d105501366ea9c",
"version": "0.10",
"port-version": 2
diff --git a/versions/baseline.json b/versions/baseline.json
index ebb805f2b..ef4baea73 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -445,8 +445,8 @@
"port-version": 0
},
"bitserializer": {
- "baseline": "0.10",
- "port-version": 2
+ "baseline": "0.44",
+ "port-version": 0
},
"bitserializer-cpprestjson": {
"baseline": "alias",
@@ -462,7 +462,7 @@
},
"bitserializer-rapidyaml": {
"baseline": "alias",
- "port-version": 1
+ "port-version": 2
},
"bitsery": {
"baseline": "5.2.2",