Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[uvatlas] Upgrade to dec2019 #9379

Merged
merged 4 commits into from Jan 2, 2020
Merged

[uvatlas] Upgrade to dec2019 #9379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
463169a
[uvatlas] Upgrade to dec2019
AlvinZhangH Dec 20, 2019
99f7203
[uvatlas] Delete and update deprecated functions
AlvinZhangH Dec 20, 2019
aee939d
[uvatlas] x64-uwp passing, remove from ci.baseline.txt
AlvinZhangH Dec 20, 2019
0a9d05e
[uvatlas] Don't test x86-windows-static by default, remove it
AlvinZhangH Dec 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/uvatlas/CONTROL
View file
Open in desktop
@@ -1,4 +1,4 @@
Source: uvatlas
Version: apr2019
Version: dec2019
Homepage: https://github.com/Microsoft/UVAtlas
Description: UVAtlas isochart texture atlas
11 changes: 4 additions & 7 deletions ports/uvatlas/portfile.cmake
View file
Open in desktop
@@ -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
)

Expand Down Expand Up @@ -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)
1 change: 0 additions & 1 deletion scripts/ci.baseline.txt
View file
Open in desktop
Expand Up @@ -1705,7 +1705,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
Expand Down