From f3a67b0c4d7b0ee4feaf912ed1729ed1c4419826 Mon Sep 17 00:00:00 2001 From: Kristian Duske Date: Mon, 27 Jan 2025 04:26:52 +0100 Subject: [PATCH] [rapidjson] Set Cmake minimum required version to a range (#43480) --- ports/rapidjson/portfile.cmake | 2 +- ports/rapidjson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/rapidjson.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/rapidjson/portfile.cmake b/ports/rapidjson/portfile.cmake index 698fe0d5453700..36b53db5bf5f35 100644 --- a/ports/rapidjson/portfile.cmake +++ b/ports/rapidjson/portfile.cmake @@ -34,7 +34,7 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/RapidJSONConfig.cmake" _contents) -string(REPLACE "VERSION 3.0" "VERSION 3.5" _contents "${_contents}") +string(REPLACE "VERSION 3.0" "VERSION 3.5...3.30" _contents "${_contents}") string(REPLACE "\${RapidJSON_SOURCE_DIR}" "\${RapidJSON_CMAKE_DIR}/../.." _contents "${_contents}") string(REPLACE "set( RapidJSON_SOURCE_DIR \"${SOURCE_PATH}\")" "" _contents "${_contents}") string(REPLACE "set( RapidJSON_DIR \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel\")" "" _contents "${_contents}") diff --git a/ports/rapidjson/vcpkg.json b/ports/rapidjson/vcpkg.json index 5d1579f29cd516..845d82daca36e5 100644 --- a/ports/rapidjson/vcpkg.json +++ b/ports/rapidjson/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rapidjson", "version-date": "2023-07-17", - "port-version": 1, + "port-version": 2, "description": "A fast JSON parser/generator for C++ with both SAX/DOM style API ", "homepage": "http://rapidjson.org/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 903e88a1850c6a..165cd3df4111de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7838,7 +7838,7 @@ }, "rapidjson": { "baseline": "2023-07-17", - "port-version": 1 + "port-version": 2 }, "rapidxml": { "baseline": "1.13", diff --git a/versions/r-/rapidjson.json b/versions/r-/rapidjson.json index c0a5a6df2ace1d..1485d65d76dc95 100644 --- a/versions/r-/rapidjson.json +++ b/versions/r-/rapidjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38b67535aa1b51fd521021ec77ccb36f01431bd2", + "version-date": "2023-07-17", + "port-version": 2 + }, { "git-tree": "a3dfe7dca3a1a27564b1fc5a9aea657cd9dae01c", "version-date": "2023-07-17",