diff options
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/ms-gltf/portfile.cmake | 29 | ||||
| -rw-r--r-- | ports/ms-gltf/vcpkg.json | 10 |
2 files changed, 24 insertions, 15 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" |