diff options
| author | Chuck Walbourn <walbourn@users.noreply.github.com> | 2021-04-09 09:54:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-09 09:54:41 -0700 |
| commit | 2d7a8443acca90ac05257c7a54c11567820bc050 (patch) | |
| tree | d29ba92df42efd2652d3519d094894c33cc26b41 /ports/directxmesh | |
| parent | 7ee07915db7b88519102a8001fcaebc613cb0aa4 (diff) | |
| download | vcpkg-2d7a8443acca90ac05257c7a54c11567820bc050.tar.gz vcpkg-2d7a8443acca90ac05257c7a54c11567820bc050.zip | |
[directxtex,directxmesh, directxtk, directxtk12, uvatlas] updated for April 2021 releases (#17123)
* directxmesh, directxtex, directxtk, directxtk12, uvatlas updated for April 2021 release
* Updated versions
Diffstat (limited to 'ports/directxmesh')
| -rw-r--r-- | ports/directxmesh/CONTROL | 6 | ||||
| -rw-r--r-- | ports/directxmesh/portfile.cmake | 28 |
2 files changed, 18 insertions, 16 deletions
diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL index 9acc00503..20b2829ae 100644 --- a/ports/directxmesh/CONTROL +++ b/ports/directxmesh/CONTROL @@ -1,8 +1,8 @@ Source: directxmesh -Version: jan2021b -Homepage: https://walbourn.github.io/directxmesh +Version: apr2021 +Homepage: https://github.com/microsoft/DirectXMesh Description: DirectXMesh geometry processing library -Build-Depends: directxmath(linux), directx-headers(linux) +Build-Depends: directxmath, directx-headers Supports: windows|linux Feature: dx12 diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index f88841682..3c5c8e99d 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 jan2021b
- SHA512 dab353d5033c32cf5667b95820cf3048e4773fa3fed16d24b25a515fbf4b6f6792ab5955dc9bb790c911b4cae1af1166aa0fdc4f5a639b3f4c3c81a2451a9a40
+ REF apr2021
+ SHA512 9e125c1b00c03cb0ff2f5297567e3d5c885acf5c3309208b7f846543eb4114129733676fe6f77b9c33adeb2ad50504927fff9fe48b7fe3f2c042432d0737564c
HEAD_REF master
)
@@ -35,18 +35,12 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
-if((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP))
- vcpkg_copy_tools(
- TOOL_NAMES meshconvert
- SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake
- )
-
-elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
+if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
vcpkg_download_distfile(
MESHCONVERT_EXE
- URLS "https://github.com/Microsoft/DirectXMesh/releases/download/jan2021/meshconvert.exe"
- FILENAME "meshconvert-jan2021.exe"
- SHA512 7df51baa495859aab418d194fd885cf37945ec2927122c18718b3a1a7d7ceb08c6853d084d74bf2bf2bc9ace47a351fd6b8d03706507f4966111ec1cb83f43a2
+ URLS "https://github.com/Microsoft/DirectXMesh/releases/download/apr2021/meshconvert.exe"
+ FILENAME "meshconvert-apr2021.exe"
+ SHA512 0b2dd64f89d884734ad0c58690f50b84acbcd3ab61db79a5b2edf8effb9a756e38862cf599da9969cd30adc9a8f8fe6c8a3c0a3a4b4beef9be87dee8ad496871
)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/")
@@ -55,7 +49,15 @@ elseif((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-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe)
+ file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-apr2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe)
+
+elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP))
+
+ vcpkg_copy_tools(
+ TOOL_NAMES meshconvert
+ SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake
+ )
+
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|