diff options
| author | Francisco Facioni <francisco@remyrobotics.com> | 2021-04-23 18:46:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-23 10:46:47 -0700 |
| commit | 5a5d5412233d13986e8ee526a0839d4d65a9bd07 (patch) | |
| tree | 7781a1c24522b5a58f9facc03e816590a4fc49fa | |
| parent | 76f93fd1e16e93c1cffd9d9392dd66794b913157 (diff) | |
| download | vcpkg-5a5d5412233d13986e8ee526a0839d4d65a9bd07.tar.gz vcpkg-5a5d5412233d13986e8ee526a0839d4d65a9bd07.zip | |
[tinygltf] fix json path (#17415)
| -rw-r--r-- | ports/tinygltf/CONTROL | 3 | ||||
| -rw-r--r-- | ports/tinygltf/portfile.cmake | 8 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/t-/tinygltf.json | 5 |
4 files changed, 12 insertions, 6 deletions
diff --git a/ports/tinygltf/CONTROL b/ports/tinygltf/CONTROL index ceba5f92b..c4581faa6 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 ef263046b..fbb2d2ff9 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 4931f9e98..40b3c4804 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 199f78939..f0cdfb1d3 100644 --- a/versions/t-/tinygltf.json +++ b/versions/t-/tinygltf.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "a0991e25859335be940b034a0d5ec369cdb1f14c", + "version-string": "2020-07-28", + "port-version": 1 + }, + { "git-tree": "a81aa48035ba08138ce76fff8d000052332604ae", "version-string": "2020-07-28", "port-version": 0 |