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.

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

directxtex, directxmesh, directxtk, uvatlas ports updated to fix cach… #15639

Merged
merged 4 commits into from Jan 15, 2021
Merged

Conversation

walbourn
Copy link
Member

@walbourn walbourn commented Jan 14, 2021

Resolves cache collision and subsequent hash problems for the cases where I download a presigned/prebuilt command-line tool instead of building it (x64-uwp for directxtex, directxmesh, directxtk; and uvatlas, x64-windows and x64-uwp for directxtk12). This fixes 'upgrade' scenarios that were a regression in the jan2021 port update.

Also rev'd these ports to jan2021b to include some minor upstream CMake cleanup to silence build warnings. This includes fixing some build breaks due to cmake default libs quirks with the arm-windows triplet for directxtex and uvatlas.

@JackBoosY JackBoosY self-assigned this Jan 14, 2021
@JackBoosY JackBoosY added the category:port-bug The issue is with a library, which is something the port should already support label Jan 14, 2021
ports/directxmesh/portfile.cmake Show resolved Hide resolved
ports/directxtex/portfile.cmake Show resolved Hide resolved
ports/directxtk/portfile.cmake Show resolved Hide resolved
ports/directxtk12/portfile.cmake Show resolved Hide resolved
ports/uvatlas/portfile.cmake Show resolved Hide resolved
@JackBoosY JackBoosY added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Jan 15, 2021
@walbourn
Copy link
Member Author

Verified the ports build with all supported triplets:

vcpkg install directxtk:x86-windows
vcpkg install directxtk:x86-windows-static
vcpkg install directxtk:x64-windows
vcpkg install directxtk:x64-windows-static
vcpkg install directxtk:arm64-windows
vcpkg install directxtk:arm64-windows-static
vcpkg install directxtk:arm-windows
vcpkg install directxtk:x86-uwp
vcpkg install directxtk:x64-uwp
vcpkg install directxtk:arm-uwp
vcpkg install directxtk:arm64-uwp

vcpkg install directxtk12:x86-windows
vcpkg install directxtk12:x86-windows-static
vcpkg install directxtk12:x64-windows
vcpkg install directxtk12:x64-windows-static
vcpkg install directxtk12:arm64-windows
vcpkg install directxtk12:arm64-windows-static
vcpkg install directxtk12:arm-windows
vcpkg install directxtk12:x86-uwp
vcpkg install directxtk12:x64-uwp
vcpkg install directxtk12:arm-uwp
vcpkg install directxtk12:arm64-uwp

vcpkg install directxtex:x86-windows
vcpkg install directxtex[openexr]:x86-windows --recurse
vcpkg install directxtex:x86-windows-static
vcpkg install directxtex:x64-windows
vcpkg install directxtex[openexr]:x64-windows --recurse
vcpkg install directxtex:x64-windows-static
vcpkg install directxtex:arm64-windows
vcpkg install directxtex:arm64-windows-static
vcpkg install directxtex:arm-windows
vcpkg install directxtex:x86-uwp
vcpkg install directxtex:x64-uwp
vcpkg install directxtex:arm-uwp
vcpkg install directxtex:arm64-uwp
vcpkg install directxtex:x64-linux
vcpkg install directxtex[openexr]:x64-linux --recurse
vcpkg install directxtex:arm64-linux
vcpkg install directxtex[openexr]:arm64-linux --recurse

vcpkg install directxmesh:x86-windows
vcpkg install directxmesh:x86-windows-static
vcpkg install directxmesh:x64-windows
vcpkg install directxmesh:x64-windows-static
vcpkg install directxmesh:arm64-windows
vcpkg install directxmesh:arm64-windows-static
vcpkg install directxmesh:arm-windows
vcpkg install directxmesh:x86-uwp
vcpkg install directxmesh:x64-uwp
vcpkg install directxmesh:arm-uwp
vcpkg install directxmesh:arm64-uwp
vcpkg install directxmesh:x64-linux
vcpkg install directxmesh:arm64-linux

vcpkg install uvatlas:x86-windows
vcpkg install uvatlas:x86-windows-static
vcpkg install uvatlas:x64-windows
vcpkg install uvatlas:x64-windows-static
vcpkg install uvatlas:arm64-windows
vcpkg install uvatlas:arm64-windows-static
vcpkg install uvatlas:arm-windows
vcpkg install uvatlas:x86-uwp
vcpkg install uvatlas:x64-uwp
vcpkg install uvatlas:arm-uwp
vcpkg install uvatlas:arm64-uwp
vcpkg install uvatlas:x64-linux
vcpkg install uvatlas:arm64-linux

Included arm-windows now that I know with VS 2019 this triplet is no longer 'access restricted' like it had been for Windows on ARM VS2012 - VS 2017.

Note that there isn't a arm-windows-static triplet defined for vcpkg.

@JackBoosY
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@dan-shaw dan-shaw merged commit a2cc2b1 into microsoft:master Jan 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants