aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhoebe <20694052+PhoebeHui@users.noreply.github.com>2020-01-03 05:28:13 +0800
committerdan-shaw <51385773+dan-shaw@users.noreply.github.com>2020-01-02 13:28:13 -0800
commitc0557247858d1e51de6e12b57923c6c814196d5a (patch)
tree1b9697a43718fda3f3f7aff4edcbd393cef767a5
parentc7dfd5f83fe4f652d49d54e9193d5f6934aa16aa (diff)
downloadvcpkg-c0557247858d1e51de6e12b57923c6c814196d5a.tar.gz
vcpkg-c0557247858d1e51de6e12b57923c6c814196d5a.zip
[directxtk] Fix invalid solution configuration (#9508)
* [directxtk] Fix invalid solution configuration * Remove PLATFORM parameter
-rw-r--r--ports/directxtk/CONTROL2
-rw-r--r--ports/directxtk/portfile.cmake11
2 files changed, 5 insertions, 8 deletions
diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL
index ae604ef6f..6508ceaf7 100644
--- a/ports/directxtk/CONTROL
+++ b/ports/directxtk/CONTROL
@@ -1,4 +1,4 @@
Source: directxtk
-Version: dec2019
+Version: 2019-12-31
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 937290102..5c7fa3788 100644
--- a/ports/directxtk/portfile.cmake
+++ b/ports/directxtk/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
@@ -9,8 +7,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXTK
- REF dec2019
- SHA512 7a1f8e6b871552585ace70c2d40e02524c8aef274cec90cc93c25197c9eaa39f244d11082912083ad654df6f301da2076f36ac2195f3c9df278eefeda99af5a1
+ REF 9cac24555395925e3c1039bcbbae306da09742ed
+ SHA512 0cea14919cce3c31ec94826fbf65069fcd1a4654cbbf50caa9e44bad6087437e6bec4538627db18b1c5704ea27b056899040da4a7355abfbf35219b4552c07f2
HEAD_REF master
)
@@ -42,12 +40,11 @@ endif()
vcpkg_build_msbuild(
PROJECT_PATH ${SOURCE_PATH}/DirectXTK_${SLN_NAME}.sln
- PLATFORM ${BUILD_ARCH}
)
file(INSTALL
- ${SOURCE_PATH}/Inc/
- DESTINATION ${CURRENT_PACKAGES_DIR}/include/DirectXTK
+ ${SOURCE_PATH}/Inc/
+ DESTINATION ${CURRENT_PACKAGES_DIR}/include/DirectXTK
)
file(INSTALL