diff options
| author | Tatsuro Shibamura <me@shibayan.jp> | 2019-12-21 09:19:51 +0900 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-12-20 16:19:51 -0800 |
| commit | 024350d0e10bb70a013b22b00ac58dc62aab5958 (patch) | |
| tree | c74b0a615fa4c276e82db7f7bdc3737f388579cd | |
| parent | 765923bcf6319689bfcad1b204741eda44ebfe89 (diff) | |
| download | vcpkg-024350d0e10bb70a013b22b00ac58dc62aab5958.tar.gz vcpkg-024350d0e10bb70a013b22b00ac58dc62aab5958.zip | |
[directxtk12] Update to dec2019 release (#9382)
* [directxtk12] Update to dec2019 release
* [directxtk12] Replace UWP detection with VCPKG_TARGET_IS_UWP
| -rw-r--r-- | ports/directxtk12/CONTROL | 2 | ||||
| -rw-r--r-- | ports/directxtk12/portfile.cmake | 6 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/ports/directxtk12/CONTROL b/ports/directxtk12/CONTROL index 10075c2be..cd3f00b7b 100644 --- a/ports/directxtk12/CONTROL +++ b/ports/directxtk12/CONTROL @@ -1,4 +1,4 @@ Source: directxtk12
-Version: oct2019
+Version: dec2019
Homepage: https://walbourn.github.io/directx-tool-kit-for-directx-12
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 7ce28b84f..52f8897a6 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -9,8 +9,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF oct2019 - SHA512 10ad63b35574900b8f68f7f836b1d3056d3e862ce2ff0707809fafd97c64bc9fd1ff402a2c4c237d7aee75a876762425c9d13bc2bd242ed4eb9c4d76ba3fc685 + REF dec2019 + SHA512 2144c7a51ea73efea5ad4db3b0b92bfc5a2ca57c38e7f6702ce82a09049266a3aaad4500856a964c4069aa711973d3a10cb3b133397ec93bda3a4a0328b9d81c HEAD_REF master ) @@ -30,7 +30,7 @@ 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}_Win10") diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 96b4e48ef..49180c8fe 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -334,7 +334,6 @@ directxtk:arm64-windows=fail directxtk:x64-linux=fail
directxtk:x64-osx=fail
directxtk:x64-windows-static=fail
-directxtk12:arm64-windows=fail
directxtk12:x64-linux=fail
directxtk12:x64-osx=fail
directxtk12:x64-windows-static=fail
|