diff options
| author | RT222 <contact@rt2.fr> | 2019-08-13 23:27:28 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-08-13 14:27:28 -0700 |
| commit | 56136b326897dc36d172e13f712879cca127932e (patch) | |
| tree | 50670cdb5794e2d860bc95d8f0e6471f6fe80bbd /ports/directxtex | |
| parent | 86ec91b6ee56ab59a03d966fc3e38e74f4382874 (diff) | |
| download | vcpkg-56136b326897dc36d172e13f712879cca127932e.tar.gz vcpkg-56136b326897dc36d172e13f712879cca127932e.zip | |
[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
Diffstat (limited to 'ports/directxtex')
| -rw-r--r-- | ports/directxtex/CONTROL | 2 | ||||
| -rw-r--r-- | ports/directxtex/portfile.cmake | 50 |
2 files changed, 35 insertions, 17 deletions
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)
|