[tinygltf] Update to 2.5.0 (#21560)

* Update tinygltf to 2.5.0

* Update CI baseline

Co-authored-by: chausner <chausner@users.noreply.github.com>
This commit is contained in:
chausner 2021-11-23 00:45:07 +01:00 committed by GitHub
parent d320e1a2d6
commit 2c394515ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 9 deletions

View File

@ -2,14 +2,14 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO syoyo/tinygltf
REF 91da29972987bb4d715a09d94ecd2cefd3a487d4 #v2.4.2
SHA512 bede1f995b8f6cdab04140ab284576444ddb5baa8894150ac697e53bafbe03c339c274a2b9559572751a9408b33750d86105d8d24ebccbdfbc98555e7b3a1efd
REF v2.5.0
SHA512 f0e9c3f385deaf3c803edea05602da1cbf173e42c6946ec06b0ec6145f7f258a2429921a1c9baf0ca48353219fedeedfe4ad4516429c970ec4c27d7538873003
HEAD_REF master
)
# Put the licence file where vcpkg expects it
# Copy the tinygltf header files and fix the path to json
vcpkg_replace_string(${SOURCE_PATH}/tiny_gltf.h "#include \"json.hpp\"" "#include <nlohmann/json.hpp>")
file(INSTALL ${SOURCE_PATH}/tiny_gltf.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
vcpkg_replace_string("${SOURCE_PATH}/tiny_gltf.h" "#include \"json.hpp\"" "#include <nlohmann/json.hpp>")
file(INSTALL "${SOURCE_PATH}/tiny_gltf.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
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)

View File

@ -1,7 +1,6 @@
{
"name": "tinygltf",
"version-string": "2020-07-28",
"port-version": 2,
"version": "2.5.0",
"description": "A header only C++11 glTF 2.0 library.",
"homepage": "https://github.com/syoyo/tinygltf",
"dependencies": [

View File

@ -6753,8 +6753,8 @@
"port-version": 3
},
"tinygltf": {
"baseline": "2020-07-28",
"port-version": 2
"baseline": "2.5.0",
"port-version": 0
},
"tinynpy": {
"baseline": "1.0.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "68e4d0aabd2073861e4add08af282c0eff858a1e",
"version": "2.5.0",
"port-version": 0
},
{
"git-tree": "7c5eabb454edeec3963a53675cc460732fe96a9c",
"version-string": "2020-07-28",