The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 11:07:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

[directxmesh] Update to dec2019 release (#9384)

Browse Source 
* [directxmesh] Update to dec2019 release

* [directxmesh] Replace UWP detection with VCPKG_TARGET_IS_UWP
This commit is contained in:
Tatsuro Shibamura 2019-12-21 09:20:50 +09:00 committed by Robert Schumacher
parent 1258ac0a10
commit b5657848d4
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/directxmesh/CONTROL
View File

@ -1,4 +1,4 @@
Source: directxmesh Source: directxmesh
Version: aug2019 Version: dec2019
Homepage: https://walbourn.github.io/directxmesh Homepage: https://walbourn.github.io/directxmesh
Description: DirectXMesh geometry processing library Description: DirectXMesh geometry processing library

14
ports/directxmesh/portfile.cmake
View File

@ -9,8 +9,8 @@ endif()
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXMesh REPO Microsoft/DirectXMesh
REF aug2019 REF dec2019
SHA512 7b5a02783444a89813c6736e3d6eadf66515bdd10055b9b6b1bc25b30ee0ec315ec9936d3a9bd52b2b8df78b3b5072465963c8123c04f77a1838d5cddc4eeb21 SHA512 b48b144172574d56775f7607d7ee7370b427fd95ab4e3089cdaf79b6cbd7fc4bbc15264d9a6703840b763bc2f4a5974594afa39f113960df34e07adfd74561d6
HEAD_REF master HEAD_REF master
) )
@ -30,10 +30,14 @@ else()
message(FATAL_ERROR "Unsupported platform toolset.") message(FATAL_ERROR "Unsupported platform toolset.")
endif() endif()
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") if(VCPKG_TARGET_IS_UWP)
set(SLN_NAME "Windows10_${VS_VERSION}") set(SLN_NAME "Windows10_${VS_VERSION}")
else() else()
set(SLN_NAME "Desktop_${VS_VERSION}") if(TRIPLET_SYSTEM_ARCH STREQUAL "arm64")
set(SLN_NAME "Desktop_${VS_VERSION}_Win10")
else()
set(SLN_NAME "Desktop_${VS_VERSION}")
endif()
endif() endif()
vcpkg_build_msbuild( vcpkg_build_msbuild(
@ -56,7 +60,7 @@ file(INSTALL
${SOURCE_PATH}/DirectXMesh/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/DirectXMesh.pdb ${SOURCE_PATH}/DirectXMesh/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/DirectXMesh.pdb
DESTINATION ${CURRENT_PACKAGES_DIR}/lib) DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") if(NOT VCPKG_TARGET_IS_UWP AND NOT TRIPLET_SYSTEM_ARCH STREQUAL "arm64")
set(TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/directxmesh) set(TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/directxmesh)
file(MAKE_DIRECTORY ${TOOL_PATH}) file(MAKE_DIRECTORY ${TOOL_PATH})
file(INSTALL file(INSTALL

1
scripts/ci.baseline.txt
View File

@ -322,7 +322,6 @@ devicenameresolver:x64-windows-static=fail
dimcli:arm-uwp=fail dimcli:arm-uwp=fail
dimcli:x64-osx=fail dimcli:x64-osx=fail
dimcli:x64-uwp=fail dimcli:x64-uwp=fail
directxmesh:arm64-windows=fail
directxmesh:x64-linux=fail directxmesh:x64-linux=fail
directxmesh:x64-osx=fail directxmesh:x64-osx=fail
directxmesh:x64-windows-static=fail directxmesh:x64-windows-static=fail