[pdal] Prepare for nlohmann-json 3.11.x (#26206)

* [pdal] Prepare for nlohmann-json 3.11.x

In nlohmann-json 3.11.0, json_fwd.hpp changed.
Replace PDAL's internal copy of the file as part of the de-vendoring
process.

* [pdal] Bump port version

* [pdal] Add dependency nlohmann-json

* [pdal] Update versions
This commit is contained in:
Florian Albrechtskirchinger 2022-08-08 21:07:58 +02:00 committed by GitHub
parent bea0562dbb
commit 82da19b369
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 1 deletions

View File

@ -23,10 +23,14 @@ endforeach()
file(REMOVE_RECURSE
"${SOURCE_PATH}/vendor/nanoflann"
"${SOURCE_PATH}/vendor/nlohmann"
"${SOURCE_PATH}/pdal/JsonFwd.hpp"
)
file(INSTALL "${CURRENT_INSTALLED_DIR}/include/nanoflann.hpp" DESTINATION "${SOURCE_PATH}/vendor/nanoflann")
file(INSTALL "${CURRENT_INSTALLED_DIR}/include/nlohmann/json.hpp" DESTINATION "${SOURCE_PATH}/vendor/nlohmann/nlohmann")
file(APPEND "${SOURCE_PATH}/vendor/nlohmann/nlohmann/json.hpp" "namespace NL = nlohmann;\n")
file(INSTALL "${CURRENT_INSTALLED_DIR}/include/nlohmann/json_fwd.hpp" DESTINATION "${SOURCE_PATH}/pdal")
file(RENAME "${SOURCE_PATH}/pdal/json_fwd.hpp" "${SOURCE_PATH}/pdal/JsonFwd.hpp")
file(APPEND "${SOURCE_PATH}/pdal/JsonFwd.hpp" "namespace NL = nlohmann;\n")
unset(ENV{OSGEO4W_HOME})

View File

@ -1,6 +1,7 @@
{
"name": "pdal",
"version": "2.4.0",
"port-version": 1,
"description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.",
"homepage": "https://pdal.io/",
"license": null,
@ -17,6 +18,7 @@
"libgeotiff",
"libxml2",
"nanoflann",
"nlohmann-json",
{
"name": "vcpkg-cmake",
"host": true

View File

@ -5446,7 +5446,7 @@
},
"pdal": {
"baseline": "2.4.0",
"port-version": 0
"port-version": 1
},
"pdal-c": {
"baseline": "2.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0c5321217b19b80c58854e9cd2141633e00c0fc7",
"version": "2.4.0",
"port-version": 1
},
{
"git-tree": "674fea8cc4044272fef94a061252c4aeb4e6373c",
"version": "2.4.0",