From 5a5d5412233d13986e8ee526a0839d4d65a9bd07 Mon Sep 17 00:00:00 2001
From: Francisco Facioni <francisco@remyrobotics.com>
Date: Fri, 23 Apr 2021 18:46:47 +0100
Subject: [PATCH] [tinygltf] fix json path (#17415)

---
 ports/tinygltf/CONTROL        | 3 ++-
 ports/tinygltf/portfile.cmake | 8 ++++----
 versions/baseline.json        | 2 +-
 versions/t-/tinygltf.json     | 5 +++++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ports/tinygltf/CONTROL b/ports/tinygltf/CONTROL
index ceba5f92b1..c4581faa6a 100644
--- a/ports/tinygltf/CONTROL
+++ b/ports/tinygltf/CONTROL
@@ -1,5 +1,6 @@
 Source: tinygltf
 Version: 2020-07-28
+Port-Version: 1
 Homepage: https://github.com/syoyo/tinygltf
 Description: A header only C++11 glTF 2.0 library.
-Build-Depends: stb, nlohmann-json
\ No newline at end of file
+Build-Depends: stb, nlohmann-json
diff --git a/ports/tinygltf/portfile.cmake b/ports/tinygltf/portfile.cmake
index ef263046bb..fbb2d2ff9f 100644
--- a/ports/tinygltf/portfile.cmake
+++ b/ports/tinygltf/portfile.cmake
@@ -8,8 +8,8 @@ vcpkg_from_github(
 )
 
 # Put the licence file where vcpkg expects it
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinygltf/LICENSE)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/tinygltf/LICENSE ${CURRENT_PACKAGES_DIR}/share/tinygltf/copyright)
+# 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)
 
-# Copy the tinygltf header files
-file(COPY ${SOURCE_PATH}/tiny_gltf.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/versions/baseline.json b/versions/baseline.json
index 4931f9e98e..40b3c48049 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6026,7 +6026,7 @@
     },
     "tinygltf": {
       "baseline": "2020-07-28",
-      "port-version": 0
+      "port-version": 1
     },
     "tinynpy": {
       "baseline": "1.0.0-3",
diff --git a/versions/t-/tinygltf.json b/versions/t-/tinygltf.json
index 199f789396..f0cdfb1d36 100644
--- a/versions/t-/tinygltf.json
+++ b/versions/t-/tinygltf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a0991e25859335be940b034a0d5ec369cdb1f14c",
+      "version-string": "2020-07-28",
+      "port-version": 1
+    },
     {
       "git-tree": "a81aa48035ba08138ce76fff8d000052332604ae",
       "version-string": "2020-07-28",