[directxtk][directxtk12][directxmesh][directxtex] Updated to June version and improved platform toolset support (#7665)

* [directxtk][directxtk12][directxmesh][directxtex] Updated to June version and improved platform toolset support

* [directxtk12] Fixed build error on x86 platform

* [directxmesh][directxtex] Fixed UWP builds failure

8 files changed, 130 insertions, 68 deletions

diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL
index 700756964..331466f53 100644
--- a/ports/directxmesh/CONTROL
+++ b/ports/directxmesh/CONTROL
@@ -1,4 +1,4 @@
 Source: directxmesh
-Version: apr2019
+Version: jun2019-1
 Homepage: https://github.com/Microsoft/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 53cd44b0c..3cf718727 100644
--- a/ports/directxmesh/portfile.cmake
+++ b/ports/directxmesh/portfile.cmake
@@ -3,14 +3,14 @@ include(vcpkg_common_functions)
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

 

 if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")

-  message(FATAL_ERROR "DirectXMesh only supports dynamic CRT linkage")

+    message(FATAL_ERROR "DirectXMesh only supports dynamic CRT linkage")

 endif()

 

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO Microsoft/DirectXMesh

-    REF apr2019
-    SHA512 a9e0dbf6483633a1727592de7e2fa733de993daff848d9ec2241ce54b67c7d24ed0419058f2f6ce256021dcf7e16d178b62ed9b8c7a1756504ab044f8740be1d

+    REF jun2019

+    SHA512 6d42cd4d3e34e7f3bd5cee1a9ad90c9f89eafa55951a0a8d776034a05caa06b0fd17629547d14c8f2b4d0c5fafdbd24ae05c2a6582b5d069093d6b4dadac09a0

     HEAD_REF master

 )

 

@@ -20,8 +20,24 @@ ELSE()
     SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})

 ENDIF()

 

+if (VCPKG_PLATFORM_TOOLSET STREQUAL "v140")

+    set(VS_VERSION "2015")

+elseif (VCPKG_PLATFORM_TOOLSET STREQUAL "v141")

+    set(VS_VERSION "2017")

+elseif (VCPKG_PLATFORM_TOOLSET STREQUAL "v142")

+    set(VS_VERSION "2019")

+else()

+    message(FATAL_ERROR "Unsupported platform toolset.")

+endif()

+

+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

+    set(SLN_NAME "Windows10_${VS_VERSION}")

+else()

+    set(SLN_NAME "Desktop_${VS_VERSION}")

+endif()

+

 vcpkg_build_msbuild(

-    PROJECT_PATH ${SOURCE_PATH}/DirectXMesh_Desktop_2017.sln

+    PROJECT_PATH ${SOURCE_PATH}/DirectXMesh_${SLN_NAME}.sln

     PLATFORM ${BUILD_ARCH}

 )

 

@@ -30,17 +46,21 @@ file(INSTALL
     ${SOURCE_PATH}/DirectXMesh/DirectXMesh.inl

     DESTINATION ${CURRENT_PACKAGES_DIR}/include

 )

+

 file(INSTALL

-    ${SOURCE_PATH}/DirectXMesh/Bin/Desktop_2017/${BUILD_ARCH}/Debug/DirectXMesh.lib

+    ${SOURCE_PATH}/DirectXMesh/Bin/${SLN_NAME}/${BUILD_ARCH}/Debug/DirectXMesh.lib

     DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)

 file(INSTALL

-    ${SOURCE_PATH}/DirectXMesh/Bin/Desktop_2017/${BUILD_ARCH}/Release/DirectXMesh.lib

+    ${SOURCE_PATH}/DirectXMesh/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/DirectXMesh.lib

     DESTINATION ${CURRENT_PACKAGES_DIR}/lib)

 

-set(TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools)

-file(INSTALL

-    ${SOURCE_PATH}/Meshconvert/Bin/Desktop_2017/${BUILD_ARCH}/Release/Meshconvert.exe

-    DESTINATION ${TOOL_PATH})

+if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

+    set(TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/directxmesh)

+    file(MAKE_DIRECTORY ${TOOL_PATH})

+    file(INSTALL

+        ${SOURCE_PATH}/Meshconvert/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/Meshconvert.exe

+        DESTINATION ${TOOL_PATH})

+endif()

 

 # Handle copyright

 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/directxmesh)

diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL
index 69b6d2ee2..4eb03bb01 100644
--- a/ports/directxtex/CONTROL
+++ b/ports/directxtex/CONTROL
@@ -1,4 +1,4 @@
 Source: directxtex

-Version: apr2019

+Version: jun2019-1

 Homepage: https://github.com/Microsoft/DirectXTex

 Description: DirectXTex texture processing library
\ No newline at end of file
diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake
index 94f9b69cb..a58d53169 100644
--- a/ports/directxtex/portfile.cmake
+++ b/ports/directxtex/portfile.cmake
@@ -9,8 +9,8 @@ endif()
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO Microsoft/DirectXTex

-    REF apr2019
-    SHA512 3e50c5beb25416a0720614321bb2b712b5677b50989909ca703801080023f8f8ad168bbe4e5dc522500325989a8f6982026d7dc5029ee28d9dcfe35efdd002de

+    REF jun2019

+    SHA512 036a4593f8117e622cd6f609aea5bad734f9c3fc239984ec4f970cb6634ac3097cdb5ed2e467d3b1549e2340bcfe10ee4925b4e3691cf7f729ca538d3724c26e

     HEAD_REF master

 )

 

@@ -20,8 +20,24 @@ ELSE()
     SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})

 ENDIF()

 

+if (VCPKG_PLATFORM_TOOLSET STREQUAL "v140")

+    set(VS_VERSION "2015")

+elseif (VCPKG_PLATFORM_TOOLSET STREQUAL "v141")

+    set(VS_VERSION "2017")

+elseif (VCPKG_PLATFORM_TOOLSET STREQUAL "v142")

+    set(VS_VERSION "2019")

+else()

+    message(FATAL_ERROR "Unsupported platform toolset.")

+endif()

+

+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

+    set(SLN_NAME "Windows10_${VS_VERSION}")

+else()

+    set(SLN_NAME "Desktop_${VS_VERSION}")

+endif()

+

 vcpkg_build_msbuild(

-    PROJECT_PATH ${SOURCE_PATH}/DirectXTex_Desktop_2017.sln

+    PROJECT_PATH ${SOURCE_PATH}/DirectXTex_${SLN_NAME}.sln

     PLATFORM ${BUILD_ARCH}

 )

 

@@ -31,23 +47,25 @@ file(INSTALL
     DESTINATION ${CURRENT_PACKAGES_DIR}/include

 )

 file(INSTALL

-    ${SOURCE_PATH}/DirectXTex/Bin/Desktop_2017/${BUILD_ARCH}/Debug/DirectXTex.lib

+    ${SOURCE_PATH}/DirectXTex/Bin/${SLN_NAME}/${BUILD_ARCH}/Debug/DirectXTex.lib

     DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)

 file(INSTALL

-    ${SOURCE_PATH}/DirectXTex/Bin/Desktop_2017/${BUILD_ARCH}/Release/DirectXTex.lib

+    ${SOURCE_PATH}/DirectXTex/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/DirectXTex.lib

     DESTINATION ${CURRENT_PACKAGES_DIR}/lib)

 

-set(TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools)

-file(MAKE_DIRECTORY ${TOOL_PATH})

-file(INSTALL

-    ${SOURCE_PATH}/Texdiag/Bin/Desktop_2017/${BUILD_ARCH}/Release/texdiag.exe

-    DESTINATION ${TOOL_PATH})

-file(INSTALL

-    ${SOURCE_PATH}/Texconv/Bin/Desktop_2017/${BUILD_ARCH}/Release/Texconv.exe

-    DESTINATION ${TOOL_PATH})

-file(INSTALL

-    ${SOURCE_PATH}/Texassemble/Bin/Desktop_2017/${BUILD_ARCH}/Release/Texassemble.exe

-    DESTINATION ${TOOL_PATH})

+if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

+    set(TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/directxtex)

+    file(MAKE_DIRECTORY ${TOOL_PATH})

+    file(INSTALL

+        ${SOURCE_PATH}/Texdiag/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/texdiag.exe

+        DESTINATION ${TOOL_PATH})

+    file(INSTALL

+        ${SOURCE_PATH}/Texconv/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/Texconv.exe

+        DESTINATION ${TOOL_PATH})

+    file(INSTALL

+        ${SOURCE_PATH}/Texassemble/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/Texassemble.exe

+        DESTINATION ${TOOL_PATH})

+endif()

 

 # Handle copyright

 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/DirectXTex)

diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL
index e1f3ce5d5..cbe291a8f 100644
--- a/ports/directxtk/CONTROL
+++ b/ports/directxtk/CONTROL
@@ -1,4 +1,4 @@
 Source: directxtk
-Version: apr2019-1
+Version: jun2019-1
 Homepage: https://github.com/Microsoft/DirectXTK
 Description: A collection of helper classes for writing DirectX 11.x code in C++.
diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake
index 0449d8f61..df5e7a02b 100644
--- a/ports/directxtk/portfile.cmake
+++ b/ports/directxtk/portfile.cmake
@@ -3,16 +3,15 @@ include(vcpkg_common_functions)
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
-  message(FATAL_ERROR "DirectXTK only supports dynamic CRT linkage")
+    message(FATAL_ERROR "DirectXTK only supports dynamic CRT linkage")
 endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXTK
-    REF apr2019
-    SHA512 811ed222c1650d34a8475e44719cca8972a85d96f9ccb10548e1501eb9d28fd8685de90832b517cdcbf21ae8c9160dea69000e8dca06fab745a15a7acc14ba98
+    REF jun2019
+    SHA512 211b18ee0755802a5d44b58da2485276cabdee222d2f5fd7b42bad0bf75810e3ac1bd319b90891d9cc0345b124631ad37588422af9120cece9fa0ed769033e77
     HEAD_REF master
-    PATCHES fix-invalid-configuration.patch
 )
 
 IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
@@ -21,10 +20,20 @@ ELSE()
     SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
 ENDIF()
 
+if (VCPKG_PLATFORM_TOOLSET STREQUAL "v140")
+    set(VS_VERSION "2015")
+elseif (VCPKG_PLATFORM_TOOLSET STREQUAL "v141")
+    set(VS_VERSION "2017")
+elseif (VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
+    set(VS_VERSION "2019")
+else()
+    message(FATAL_ERROR "Unsupported platform toolset.")
+endif()
+
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-  set(SLN_NAME "Windows10")
+    set(SLN_NAME "Windows10_${VS_VERSION}")
 else()
-  set(SLN_NAME "Desktop_2017")
+    set(SLN_NAME "Desktop_${VS_VERSION}")
 endif()
 
 vcpkg_build_msbuild(
@@ -33,6 +42,11 @@ vcpkg_build_msbuild(
 )
 
 file(INSTALL
+	${SOURCE_PATH}/Inc/
+	DESTINATION ${CURRENT_PACKAGES_DIR}/include/DirectXTK
+)
+
+file(INSTALL
     ${SOURCE_PATH}/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/DirectXTK.lib
     DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
 
@@ -41,22 +55,15 @@ file(INSTALL
     DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
 
 if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-  set(DXTK_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/directxtk)
-  file(MAKE_DIRECTORY ${DXTK_TOOL_PATH})
-
-  file(INSTALL
-	  ${SOURCE_PATH}/MakeSpriteFont/bin/Release/MakeSpriteFont.exe
-	  DESTINATION ${DXTK_TOOL_PATH})
-
-  file(INSTALL
-	  ${SOURCE_PATH}/XWBTool/Bin/Desktop_2017/${BUILD_ARCH}/Release/XWBTool.exe
-	  DESTINATION ${DXTK_TOOL_PATH})
+    set(DXTK_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/directxtk)
+    file(MAKE_DIRECTORY ${DXTK_TOOL_PATH})
+    file(INSTALL
+        ${SOURCE_PATH}/MakeSpriteFont/bin/Release/MakeSpriteFont.exe
+        DESTINATION ${DXTK_TOOL_PATH})
+    file(INSTALL
+        ${SOURCE_PATH}/XWBTool/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/XWBTool.exe
+        DESTINATION ${DXTK_TOOL_PATH})
 endif()
 
-file(INSTALL
-	${SOURCE_PATH}/Inc/
-	DESTINATION ${CURRENT_PACKAGES_DIR}/include/DirectXTK
-)
-
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/directxtk RENAME copyright)
diff --git a/ports/directxtk12/CONTROL b/ports/directxtk12/CONTROL
index 466acece6..2d7c849c2 100644
--- a/ports/directxtk12/CONTROL
+++ b/ports/directxtk12/CONTROL
@@ -1,4 +1,4 @@
 Source: directxtk12

-Version: dec2016-1

+Version: jun2019-1

 Homepage: https://github.com/Microsoft/DirectXTK12

 Description: A collection of helper classes for writing DirectX 12 code in C++.

diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake
index d51a82b81..114165fb4 100644
--- a/ports/directxtk12/portfile.cmake
+++ b/ports/directxtk12/portfile.cmake
@@ -3,19 +3,15 @@ include(vcpkg_common_functions)
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
-  message(FATAL_ERROR "DirectXTk12 only supports dynamic CRT linkage")
+  message(FATAL_ERROR "DirectXTK12 only supports dynamic CRT linkage")
 endif()
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DirectXTK12-dec2016)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/Microsoft/DirectXTK12/archive/dec2016.tar.gz"
-    FILENAME "DirectXTK12-dec2016.tar.gz"
-    SHA512 7c98fbf1d7ef96807a38d396a87dacdc60fdcd7e461210d246cc424789c4c5c5fb1390db958c1bd1f77da8af756a9eae36813e5da6bbb0ea1432ff4004f1d010
-)
-vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/DirectXTK_Desktop_2015_Win10.sln
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Microsoft/DirectXTK12
+    REF jun2019
+    SHA512 f635746ff92cf3b60b96f74f5ada5fb8409d1ac6e2729d24ebf0ebb275e26d373ec0ccdfbb66a3cb967267da86de4d70304d1f3326b738f94f5a8fc0d43a8c97
+    HEAD_REF master
 )
 
 IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
@@ -24,17 +20,38 @@ ELSE()
 	SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
 ENDIF()
 
-file(INSTALL
-	${SOURCE_PATH}/Bin/Desktop_2015_Win10/${BUILD_ARCH}/Release/DirectXTK12.lib
-	DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-file(INSTALL
-	${SOURCE_PATH}/Bin/Desktop_2015_Win10/${BUILD_ARCH}/Debug/DirectXTK12.lib
-	DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+if (VCPKG_PLATFORM_TOOLSET STREQUAL "v140")
+    set(VS_VERSION "2015")
+elseif (VCPKG_PLATFORM_TOOLSET STREQUAL "v141")
+    set(VS_VERSION "2017")
+elseif (VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
+    set(VS_VERSION "2019")
+else()
+    message(FATAL_ERROR "Unsupported platform toolset.")
+endif()
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    set(SLN_NAME "Windows10_${VS_VERSION}")
+else()
+    set(SLN_NAME "Desktop_${VS_VERSION}_Win10")
+endif()
+
+vcpkg_build_msbuild(
+    PROJECT_PATH ${SOURCE_PATH}/DirectXTK_${SLN_NAME}.sln
+)
 
 file(INSTALL
 	${SOURCE_PATH}/Inc/
     DESTINATION ${CURRENT_PACKAGES_DIR}/include/DirectXTK12
 )
 
+file(INSTALL
+    ${SOURCE_PATH}/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/DirectXTK12.lib
+    DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+
+file(INSTALL
+    ${SOURCE_PATH}/Bin/${SLN_NAME}/${BUILD_ARCH}/Debug/DirectXTK12.lib
+    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/directxtk12 RENAME copyright)