[tinycbor] Fix file conflicts with libcbor#24056
Merged
strega-nil-ms merged 4 commits intomicrosoft:masterfrom Apr 10, 2022
Merged
[tinycbor] Fix file conflicts with libcbor#24056strega-nil-ms merged 4 commits intomicrosoft:masterfrom
strega-nil-ms merged 4 commits intomicrosoft:masterfrom
Conversation
There was a problem hiding this comment.
You have modified or added at least one vcpkg.json where a "license" field is missing.
Details
If you feel able to do so, please consider adding a "license" field to the following files:
ports/tinycbor/vcpkg.json
Valid values for the license field can be found in the documentation
Contributor
|
Thanks! |
ekilmer
added a commit
to ekilmer/vcpkg
that referenced
this pull request
Apr 12, 2022
* master: (139 commits) [dstorage] Add port for Microsoft.Direct3D.DirectStorage NuGet (microsoft#24063) [vcpkg] Refactor toolchain & generator selection (microsoft#23846) [icu] update to 70.1 (microsoft#23445) [vcpkg] Update android usage documentation (microsoft#23690) [LMDB] update to 0.9.29 (microsoft#24045) [catch2] Don't install docs (microsoft#24046) [harfbuff] fix arm64 osx build (microsoft#24055) [openxr-loader] remove from CI baseline (microsoft#24057) [imath] Update to 3.1.5 (microsoft#24059) [openssl] Fix dynamic builds on UNIX (microsoft#24061) [c-ares] update to 1.18.1 (microsoft#24062) [igraph] update to 0.9.8 (microsoft#24065) [cmake-user] Fix library check (microsoft#24070) [openxr-loader] fix ci.baseline.txt (microsoft#24073) [tinycbor] Fix file conflicts with libcbor (microsoft#24056) [graphviz,libslirp] Limit msys to windows (microsoft#24032) [bdwgc] Don't build docs (microsoft#24025) [capstone] update to 5.0.0-rc2 (microsoft#23979) [clockutils] Fix x64-windows-static-md (microsoft#23965) [braft] New port (microsoft#23830) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Describe the pull request
What does your PR fix?
I moved the header files from
includetoinclude/tinycbor.Which triplets are supported/not supported? Have you updated the CI baseline?
Unchanged
Does your PR follow the maintainer guide?
Yes
If you have added/updated a port: Have you run
./vcpkg x-add-version --alland committed the result?Yes