aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhoebe <20694052+PhoebeHui@users.noreply.github.com>2021-09-08 12:09:06 +0800
committerGitHub <noreply@github.com>2021-09-07 21:09:06 -0700
commitf63a6a53b464b6e84acc1b6328f876f2672f325f (patch)
treef24c7e167c94f7d3071e684a76621ef20dd111bc
parentb5865bfeba430cd44063fc54a45a8861195a715f (diff)
downloadvcpkg-f63a6a53b464b6e84acc1b6328f876f2672f325f.tar.gz
vcpkg-f63a6a53b464b6e84acc1b6328f876f2672f325f.zip
[ms-gltf] Update to latest release r1.9.5.4 (#19958)
* [ms-gltf] Fix the wrong homepage * Update pdb file path * Pass WINDOWS_USE_MSBUILD to vcpkg_cmake_configure * Update to latest release r1.9.5.4
-rw-r--r--ports/ms-gltf/portfile.cmake29
-rw-r--r--ports/ms-gltf/vcpkg.json10
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/m-/ms-gltf.json5
4 files changed, 30 insertions, 16 deletions
diff --git a/ports/ms-gltf/portfile.cmake b/ports/ms-gltf/portfile.cmake
index 503fdae04..1382dc046 100644
--- a/ports/ms-gltf/portfile.cmake
+++ b/ports/ms-gltf/portfile.cmake
@@ -6,8 +6,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO microsoft/glTF-SDK
- REF 9428f114b540fb93e6533d5ec460fc123efe0c86 # todo: r1.9.6.0
- SHA512 900caf6d72d360bae4c7af769a8879507f7f727b40f61723ffed679ad22877fb37daed2a0dfcbf27e15ab3adc8afe3249530b95691ce489b3446e5d9a35f205a
+ REF ac3e70392feb6aef18a07314669f6af2ebc72787 # r1.9.5.4
+ SHA512 389b801ddc6f0b29269bcd1215fa9e63fe46a1f1a8778125c6439e34fe0925d5534b1cdbea30824a4a8aa008015124dc7cc4558daa9522fc6d85e00e8e41e4a9
HEAD_REF master
PATCHES
fix-install.patch
@@ -16,26 +16,31 @@ vcpkg_from_github(
# note: Test/Sample executables won't be installed
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+ FEATURES
test ENABLE_UNIT_TESTS
samples ENABLE_SAMPLES
)
# note: Platform-native buildsystem will be more helpful to launch/debug the tests/samples.
-# note: The PDB file path is making Ninja fails to install.
+# note: The PDB file path is making Ninja fails to install.
# For Windows, we rely on /MP. The other platforms should be able to build with PREFER_NINJA.
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
+set(WINDOWS_USE_MSBUILD)
+if(VCPKG_TARGET_IS_WINDOWS)
+ set(WINDOWS_USE_MSBUILD "WINDOWS_USE_MSBUILD")
+endif()
+
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
+ ${WINDOWS_USE_MSBUILD}
OPTIONS
${FEATURE_OPTIONS}
)
-vcpkg_install_cmake()
+vcpkg_cmake_install()
vcpkg_copy_pdbs()
-file(INSTALL ${SOURCE_PATH}/LICENSE
- DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
-)
-
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
- file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/ms-gltf/vcpkg.json b/ports/ms-gltf/vcpkg.json
index f734d9586..9b7983b27 100644
--- a/ports/ms-gltf/vcpkg.json
+++ b/ports/ms-gltf/vcpkg.json
@@ -1,11 +1,15 @@
{
"name": "ms-gltf",
- "version-string": "r1.9.5.0",
+ "version-string": "r1.9.5.4",
"description": "glTF-SDK is a C++ Software Development Kit for glTF",
- "homepage": "https://github.com/microsoft/ms-gltf",
+ "homepage": "https://github.com/microsoft/glTF-SDK",
"supports": "!linux",
"dependencies": [
- "rapidjson"
+ "rapidjson",
+ {
+ "name": "vcpkg-cmake",
+ "host": true
+ }
],
"default-features": [
"test"
diff --git a/versions/baseline.json b/versions/baseline.json
index ac1a5a098..c737de997 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4289,7 +4289,7 @@
"port-version": 0
},
"ms-gltf": {
- "baseline": "r1.9.5.0",
+ "baseline": "r1.9.5.4",
"port-version": 0
},
"ms-gsl": {
diff --git a/versions/m-/ms-gltf.json b/versions/m-/ms-gltf.json
index f583a8a81..ccc4e4b3d 100644
--- a/versions/m-/ms-gltf.json
+++ b/versions/m-/ms-gltf.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "aeeeac2de78af647be1312f6e9ab687c18369e99",
+ "version-string": "r1.9.5.4",
+ "port-version": 0
+ },
+ {
"git-tree": "1c3bf009ece6942607e095c0088810b6dbf86d38",
"version-string": "r1.9.5.0",
"port-version": 0