-
Notifications
You must be signed in to change notification settings - Fork 3.1k
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
Synchronize patch files, fix resource compiler invocations in some situations #23855
base: main
Are you sure you want to change the base?
Synchronize patch files, fix resource compiler invocations in some situations #23855
Conversation
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.
@zwassall-gentuity please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.
Contributor License AgreementContribution License AgreementThis Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”),
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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?
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.