diff options
| author | Tatsuro Shibamura <me@shibayan.jp> | 2019-12-21 09:21:10 +0900 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-12-20 16:21:10 -0800 |
| commit | a732ecda63ccd9bdb31dcf07b77dfe0cd122119b (patch) | |
| tree | 7737266ba6ed49bb2a92d5d619f87c00394a3305 | |
| parent | b5657848d42b9779c780a1e7aff1a9020208de30 (diff) | |
| download | vcpkg-a732ecda63ccd9bdb31dcf07b77dfe0cd122119b.tar.gz vcpkg-a732ecda63ccd9bdb31dcf07b77dfe0cd122119b.zip | |
[directxtk] Update to dec2019 release (#9381)
* [directxtk] Update to dec2019 release
* [directxtk] Replace UWP detection with VCPKG_TARGET_IS_UWP
| -rw-r--r-- | ports/directxtk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/directxtk/portfile.cmake | 16 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 1 |
3 files changed, 11 insertions, 8 deletions
diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL index 3ce4f1670..ae604ef6f 100644 --- a/ports/directxtk/CONTROL +++ b/ports/directxtk/CONTROL @@ -1,4 +1,4 @@ Source: directxtk -Version: oct2019 +Version: dec2019 Homepage: https://walbourn.github.io/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 1e489ed81..937290102 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -9,8 +9,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF oct2019 - SHA512 d14cc3836986d4082edd34c39fda1d8c5ba4c8bfdc8640e61a3eac61e19c1eae6c7bc9ab57a353b7dc5cc04e084b71df43174aecfbd41975ebe97f0f8e7f4a86 + REF dec2019 + SHA512 7a1f8e6b871552585ace70c2d40e02524c8aef274cec90cc93c25197c9eaa39f244d11082912083ad654df6f301da2076f36ac2195f3c9df278eefeda99af5a1 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,14 +60,14 @@ file(INSTALL ${SOURCE_PATH}/Bin/${SLN_NAME}/${BUILD_ARCH}/Debug/DirectXTK.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(NOT VCPKG_TARGET_IS_UWP) 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 + ${SOURCE_PATH}/XWBTool/Bin/Desktop_${VS_VERSION}/${BUILD_ARCH}/Release/XWBTool.exe DESTINATION ${DXTK_TOOL_PATH}) endif() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 17cc4b42a..a034584f3 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -328,7 +328,6 @@ directxmesh:x64-windows-static=fail directxtex:x64-linux=fail
directxtex:x64-osx=fail
directxtex:x64-windows-static=fail
-directxtk:arm64-windows=fail
directxtk:x64-linux=fail
directxtk:x64-osx=fail
directxtk:x64-windows-static=fail
|