From a5f206e4230c8ca738315f7bb751a90f05d4db98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Tassoux?= <rt2@rt2.fr>
Date: Sat, 23 Dec 2017 15:50:33 +0100
Subject: [directxmesh] Update to the last version (dec2017)

---
 ports/directxmesh/CONTROL        |  2 +-
 ports/directxmesh/portfile.cmake | 39 +++++++++++++++++++++++----------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL
index 13401f80d..0348b1939 100644
--- a/ports/directxmesh/CONTROL
+++ b/ports/directxmesh/CONTROL
@@ -1,3 +1,3 @@
 Source: directxmesh
-Version: oct2016
+Version: dec2017
 Description: DirectXMesh geometry processing library
\ No newline at end of file
diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake
index 51840b68f..26fda2210 100644
--- a/ports/directxmesh/portfile.cmake
+++ b/ports/directxmesh/portfile.cmake
@@ -1,10 +1,16 @@
 # Common Ambient Variables:
-#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
-#   PORT is the current port name (zlib, etc)
-#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
+#   PORT                      = current port name (zlib, etc)
+#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
+#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
+#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
+#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
+#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
 #
+include(vcpkg_common_functions)
+
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     message(STATUS "Warning: Dynamic building not supported yet. Building static.")
     set(VCPKG_LIBRARY_LINKAGE static)
@@ -14,14 +20,15 @@ if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
   message(FATAL_ERROR "DirectXMesh only supports dynamic CRT linkage")
 endif()
 
-include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DirectXMesh-oct2016)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/Microsoft/DirectXMesh/archive/oct2016.tar.gz"
-    FILENAME "DirectXMesh-oct2016.tar.gz"
-    SHA512 8aaf9749766afd23709ce6c6f8d74b008fe9f96789e4d97cb387633dad34b4132ef28dfe028d13c779ea366428d53076a881c0d63c4f0c2c74d552293c8d6bf1
+set(DIRECTXMESH_VERSION dec2017)
+set(DIRECTXMESH_ARCHIVE_HASH 82468f1fcf0d51cf614921b1bd2dd06a05b120f84531d59429042951a39d1e978b5395cdf75269fe1767789ce487bfc6e544c54df4b1b9bec9adb1c853dc8497)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Microsoft/DirectXMesh
+    REF ${DIRECTXMESH_VERSION}
+    SHA512 ${DIRECTXMESH_ARCHIVE_HASH}
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
     SET(BUILD_ARCH "Win32")
@@ -30,7 +37,7 @@ ELSE()
 ENDIF()
 
 vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/DirectXMesh_Desktop_2015.sln
+    PROJECT_PATH ${SOURCE_PATH}/DirectXMesh_Desktop_2017.sln
     PLATFORM ${BUILD_ARCH}
 )
 
@@ -40,15 +47,15 @@ file(INSTALL
     DESTINATION ${CURRENT_PACKAGES_DIR}/include
 )
 file(INSTALL
-    ${SOURCE_PATH}/DirectXMesh/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DirectXMesh.lib
+    ${SOURCE_PATH}/DirectXMesh/Bin/Desktop_2017/${BUILD_ARCH}/Debug/DirectXMesh.lib
     DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
 file(INSTALL
-    ${SOURCE_PATH}/DirectXMesh/Bin/Desktop_2015/${BUILD_ARCH}/Release/DirectXMesh.lib
+    ${SOURCE_PATH}/DirectXMesh/Bin/Desktop_2017/${BUILD_ARCH}/Release/DirectXMesh.lib
     DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
 
 set(TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools)
 file(INSTALL
-    ${SOURCE_PATH}/Meshconvert/Bin/Desktop_2015/${BUILD_ARCH}/Release/Meshconvert.exe
+    ${SOURCE_PATH}/Meshconvert/Bin/Desktop_2017/${BUILD_ARCH}/Release/Meshconvert.exe
     DESTINATION ${TOOL_PATH})
 
 # Handle copyright
-- 
cgit v1.2.3