Synchronize patch files, fix resource compiler invocations in some situations #23855
Conversation
This file contains 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
This introduces some extra changes to the vcpkg configuration that were in cmake/patches/onnx/onnx.patch but not cmake/vcpkg-ports/onnx/binskim.patch, but they should be good.
This introduces some extra changes to the non-vcpkg configuration that were in cmake/vcpkg-ports/protobuf/protobuf_cmake.patch but not cmake/patches/protobuf/protobuf_cmake.patch. I believe that the changes are all welcome; in particular, the new changes to CMakeLists.txt in the patch file (from protocolbuffers/protobuf#10293) fix resource compiler invocations in some situations, as was the case for me using clang-cl on Windows.
There was a problem hiding this comment.
This is the first of the 3 patch files for eigen3, all of which were unreferenced. I removed the files with the assumption that they are unnecessary, but if this is not correct, please let me know.
| @@ -6,8 +6,7 @@ vcpkg_from_github( | |||
| REF v3.21.12 | |||
| SHA512 152f8441c325e808b942153c15e82fdb533d5273b50c25c28916ec568ada880f79242bb61ee332ac5fb0d20f21239ed6f8de02ef6256cc574b1fc354d002c6b0 | |||
| HEAD_REF master | |||
| PATCHES | |||
| protobuf_cmake.patch | |||
| PATCHES ../../patches/protobuf/protobuf_cmake.patch | |||
There was a problem hiding this comment.
I'm unsure how to test that a reference like this works as intended. Is there some CI step that will execute this and verify its validity?
|
@microsoft-github-policy-service agree company="Gentuity" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Deduplicates/synchronizes patch files in "cmake/patches" and "cmake/vcpkg-ports".
Motivation and Context
Addresses #23426 (comment) with Deduplicate/synchronize protobuf patch files:
The other deduplication/synchronization changes don't address immediate issues, but will ideally make future maintenance of these patch files less vulnerable to the possible mistake of updating one location but forgetting to consider the other.