From b5657848d42b9779c780a1e7aff1a9020208de30 Mon Sep 17 00:00:00 2001
From: Tatsuro Shibamura <me@shibayan.jp>
Date: Sat, 21 Dec 2019 09:20:50 +0900
Subject: [PATCH] [directxmesh] Update to dec2019 release (#9384)

* [directxmesh] Update to dec2019 release

* [directxmesh] Replace UWP detection with VCPKG_TARGET_IS_UWP
---
 ports/directxmesh/CONTROL        |  2 +-
 ports/directxmesh/portfile.cmake | 14 +++++++++-----
 scripts/ci.baseline.txt          |  1 -
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL
index 63b94376d..696022ea3 100644
--- a/ports/directxmesh/CONTROL
+++ b/ports/directxmesh/CONTROL
@@ -1,4 +1,4 @@
 Source: directxmesh
-Version: aug2019
+Version: dec2019
 Homepage: https://walbourn.github.io/directxmesh
 Description: DirectXMesh geometry processing library
\ No newline at end of file
diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake
index 9e95f3291..7e43ad07f 100644
--- a/ports/directxmesh/portfile.cmake
+++ b/ports/directxmesh/portfile.cmake
@@ -9,8 +9,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXMesh
-    REF aug2019
-    SHA512 7b5a02783444a89813c6736e3d6eadf66515bdd10055b9b6b1bc25b30ee0ec315ec9936d3a9bd52b2b8df78b3b5072465963c8123c04f77a1838d5cddc4eeb21
+    REF dec2019
+    SHA512 b48b144172574d56775f7607d7ee7370b427fd95ab4e3089cdaf79b6cbd7fc4bbc15264d9a6703840b763bc2f4a5974594afa39f113960df34e07adfd74561d6
     HEAD_REF master
 )
 
@@ -30,10 +30,14 @@ else()
     message(FATAL_ERROR "Unsupported platform toolset.")
 endif()
 
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+if(VCPKG_TARGET_IS_UWP)
     set(SLN_NAME "Windows10_${VS_VERSION}")
 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()
 
 vcpkg_build_msbuild(
@@ -56,7 +60,7 @@ file(INSTALL
     ${SOURCE_PATH}/DirectXMesh/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/DirectXMesh.pdb
     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)
     file(MAKE_DIRECTORY ${TOOL_PATH})
     file(INSTALL
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index ad531088a..17cc4b42a 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -322,7 +322,6 @@ devicenameresolver:x64-windows-static=fail
 dimcli:arm-uwp=fail
 dimcli:x64-osx=fail
 dimcli:x64-uwp=fail
-directxmesh:arm64-windows=fail
 directxmesh:x64-linux=fail
 directxmesh:x64-osx=fail
 directxmesh:x64-windows-static=fail