diff options
| author | Chuck Walbourn <walbourn@users.noreply.github.com> | 2021-10-01 17:03:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-01 17:03:20 -0700 |
| commit | 339d01f19c163e6990cb466d7fdf91effbd6e621 (patch) | |
| tree | ffc4059ef69a0907d24fe8fa47e5d27a7bdce3c3 /ports/directxmesh | |
| parent | ee1e12048e007f7247bd27622b13803c7a124bb1 (diff) | |
| download | vcpkg-339d01f19c163e6990cb466d7fdf91effbd6e621.tar.gz vcpkg-339d01f19c163e6990cb466d7fdf91effbd6e621.zip | |
[directxtk, directxtk12, directxtex, directxmesh, uvatlas] ports updated for September 2021 release (#20457)
* Update for September 2021 GitHub releases
* Update directx tool kit ports
* Update versions
* Convert directxmesh and uvatlas to vcpkg-cmake
* Refresh version hash
Diffstat (limited to 'ports/directxmesh')
| -rw-r--r-- | ports/directxmesh/portfile.cmake | 19 | ||||
| -rw-r--r-- | ports/directxmesh/vcpkg.json | 14 |
2 files changed, 20 insertions, 13 deletions
diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index baf22e54b..650cf50f1 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXMesh
- REF jun2021
- SHA512 ed61e14bb217bdff803ad95bfffe31aac7ff0a3f78b963aac183c61233374def4c0b052d1bf9b0d03900fc5be052e1d8fe8de00e81f01349eff1a564d55be610
+ REF sept2021
+ SHA512 e07f944080dc7e0ffe154061057a81d7caee3c4612b9261ba5a4812b3cb45571dee0a1c9b01824ccfbe9566132eadef30b80164fefe6a3ead60a3762566e2604
HEAD_REF master
)
@@ -26,21 +26,20 @@ else() set(EXTRA_OPTIONS -DBUILD_TOOLS=ON)
endif()
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS}
)
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
vcpkg_download_distfile(
MESHCONVERT_EXE
- URLS "https://github.com/Microsoft/DirectXMesh/releases/download/jun2021/meshconvert.exe"
- FILENAME "meshconvert-jun2021.exe"
- SHA512 2a5e1eb69f24fd321d372dcd790970a15957757eacd0a861001299409ff56372bc890c2d8baba32368c81eeb63cdd7aef514c57bca1e7e4e3f7bdf494c3453a0
+ URLS "https://github.com/Microsoft/DirectXMesh/releases/download/sept2021/meshconvert.exe"
+ FILENAME "meshconvert-sept2021.exe"
+ SHA512 9d527b95d3a37604ac3a4c05f8ef44e81cfd8044dd44eddc531116ee5110443679787e4719b0504dc60e406e28396e1f553388cf261b3df81103bd03391c32af
)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/")
@@ -49,7 +48,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${MESHCONVERT_EXE}
DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxmesh/)
- file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe)
+ file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe)
elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP))
diff --git a/ports/directxmesh/vcpkg.json b/ports/directxmesh/vcpkg.json index 4eb6c26be..834581b20 100644 --- a/ports/directxmesh/vcpkg.json +++ b/ports/directxmesh/vcpkg.json @@ -1,14 +1,22 @@ { "name": "directxmesh", - "version-string": "jun2021", + "version-string": "sept2021", "description": "DirectXMesh geometry processing library", - "homepage": "http://go.microsoft.com/fwlink/?LinkID=324981", + "homepage": "https://github.com/Microsoft/DirectXMesh", "documentation": "https://github.com/microsoft/DirectXMesh/wiki", "license": "MIT", "supports": "windows | linux", "dependencies": [ "directx-headers", - "directxmath" + "directxmath", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "dx12": { |