diff options
| author | Alvin <52727318+AlvinZhangH@users.noreply.github.com> | 2020-01-03 05:56:14 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2020-01-02 13:56:14 -0800 |
| commit | 97485dc0369b35e6ca4a536ee299a8d5bdfcb45c (patch) | |
| tree | 8bf6a35529723b7ad45473568f3fa276ab1a7bad | |
| parent | c81d7d9c10485804179ce7ee59b41c594d912c6b (diff) | |
| download | vcpkg-97485dc0369b35e6ca4a536ee299a8d5bdfcb45c.tar.gz vcpkg-97485dc0369b35e6ca4a536ee299a8d5bdfcb45c.zip | |
[uvatlas] Upgrade to dec2019 (#9379)
* [uvatlas] Upgrade to dec2019
* [uvatlas] Delete and update deprecated functions
* [uvatlas] x64-uwp passing, remove from ci.baseline.txt
* [uvatlas] Don't test x86-windows-static by default, remove it
| -rw-r--r-- | ports/uvatlas/CONTROL | 2 | ||||
| -rw-r--r-- | ports/uvatlas/portfile.cmake | 11 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 1 |
3 files changed, 5 insertions, 9 deletions
diff --git a/ports/uvatlas/CONTROL b/ports/uvatlas/CONTROL index 972c6741b..0c0cb84b3 100644 --- a/ports/uvatlas/CONTROL +++ b/ports/uvatlas/CONTROL @@ -1,4 +1,4 @@ Source: uvatlas
-Version: apr2019
+Version: dec2019
Homepage: https://github.com/Microsoft/UVAtlas
Description: UVAtlas isochart texture atlas
\ No newline at end of file diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index df0d322b3..deabb42d7 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -1,16 +1,14 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) -if(VCPKG_CMAKE_SYSTEM_NAME) +if(NOT VCPKG_TARGET_IS_WINDOWS) message(FATAL_ERROR "UVAtlas only supports Windows Desktop") endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas - REF 8309d95904d3a8f3559d73e07f3a0472f161c28b - SHA512 e0031812824f179dffdec487b2e70fc80748a722c4bccf67a7e0bd865700b6e61e1f14160557a1a797a84a9e7cc559f5e66bd8cabd5da4728ee479e4247d9aa2 + REF 1a0a756e5ee4bc764ee89b1e30e6b73b24d2eb55 #dec2019 + SHA512 810f320d51c11b79f211711d066873d4d082d88e0fdb662a15e105a05028b6e536f159730269865965b7eb33d8cdccb4622c5d945ab67df3e005569cb6df6e59 HEAD_REF master ) @@ -48,5 +46,4 @@ file(INSTALL DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/) # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvatlas) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/uvatlas/LICENSE ${CURRENT_PACKAGES_DIR}/share/uvatlas/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f2b1d797a..d40cdb228 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1698,7 +1698,6 @@ uvatlas:arm64-windows=fail uvatlas:arm-uwp=fail
uvatlas:x64-linux=fail
uvatlas:x64-osx=fail
-uvatlas:x64-uwp=fail
uvatlas:x64-windows-static=fail
vectorclass:arm64-windows=fail
vectorclass:arm-uwp=fail
|