[opencv4,opencv3] Control exported protobuf dependency#20550
Merged
strega-nil-ms merged 4 commits intomicrosoft:masterfrom Oct 6, 2021
Merged
[opencv4,opencv3] Control exported protobuf dependency#20550strega-nil-ms merged 4 commits intomicrosoft:masterfrom
strega-nil-ms merged 4 commits intomicrosoft:masterfrom
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
Author
|
CC @autoantwort @horenmar for review/test. |
Contributor
|
Yeah fixes #20366 👍 |
autoantwort
approved these changes
Oct 6, 2021
Contributor
|
lgtm |
Contributor
|
same identical fix must be applied to opencv3. |
dg0yt
changed the title
Contributor
Author
Done, with different feature name. |
strega-nil-ms
approved these changes
Oct 6, 2021
Contributor
|
LGTM, thanks @dg0yt :) |
yurybura
pushed a commit
to yurybura/vcpkg
that referenced
this pull request
Oct 7, 2021
* Control exported protobuf dependency * Update versions * Control exported protobuf dependency * Update versions
BillyONeal
added a commit
that referenced
this pull request
Oct 12, 2021
* [scripts/boost] fix issue #20417 [boost-iostreams] replace explicit dependencies with default-features, allow to disable compression filters * add versions * [scripts/boost] update port version after #20421 * [boost-odeint] move boost-mpi dependency to the feature * add version * [boost-modular-build-helper] rework user-config generation * [boost-python] move python3 from explicit dependency to default feature * [boost-modular-build-helper] update version * add verions * [boost-modular-build-helper] fix empty flags * update version * Fix compilation on Emscripten / WebAssembly (#20551) * [opencv4,opencv3] Control exported protobuf dependency (#20550) * Control exported protobuf dependency * Update versions * Control exported protobuf dependency * Update versions * [OpenMVS] restore deprecated cmake scripts for configure, build & fixup targets (#20422) * [OpenMVS] restore deprecated cmake scripts * [OpenMVS] fix references * switch back to vcpkg_cmake_* Co-authored-by: nicole mazzuca <mazzucan@outlook.com> * [libffi] Don't replace string in file that doesn't exist. (#20554) * Don't replace string in file that doesn't exist. * Update per bot. * Update per bot again. * Address comments. * [json-dto] Update to 0.2.14 (#20570) * json-dto updated to v.0.2.14. * json-dto-0.2.14 added to baseline. * Change deprecated commands. * Update baseline for fresh json-dto-0.2.14. * [sail] Update to 0.9.0-pre17 (#20562) * [sail] Update to 0.9.0-pre17 * [sail] vcpkg x-add-version --all --overwrite-version * [sail] Update pre17 hash * [sail] vcpkg x-add-version --all --overwrite-version * [freexl] Update to 1.0.6 (#20520) * Reformat portfile * Minimize makefiles patch * Update to 1.0.6 * Fix uwp builds, remove skip from baseline * Install pc file for windows * Update versions Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [dartsim] Update to 6.11.0 (#20566) * Update dartsim * Use newer vcpkg functions * Update version number * Update ports/dartsim/portfile.cmake Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Update versions Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * [scripts/boost] update Boost version in boost-modular-build.cmake to avoid manual changes * update version * [boost-modular-build-helper] fix USER_CONFIG_EXTRA_LINES variable name and rename generated files * update version * Resolve differences from rerunning generate-ports.ps1. Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Tobias Markus <tobbi.bugs@googlemail.com> Co-authored-by: Kai Pastor <dg0yt@darc.de> Co-authored-by: Stefano Sinigardi <stesinigardi@hotmail.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: Lars Glud <larshg@gmail.com> Co-authored-by: eao197 <eao197@users.noreply.github.com> Co-authored-by: Dmitry Baryshev <dmitrymq@gmail.com> Co-authored-by: Akash <Ace314159@users.noreply.github.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
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
5 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.
What does your PR fix?
Protobuf is only needed for feature dnn(opencv4)/flann(opencv3), but without an explicit gate, it became required when using
find_package(OpenCV REQUIRED).Fixes [zxing-cpp] build failure #20366, [opencv4] find_package(opencv ..) fails for statically built opencv4 port with minimal features #20529.
Which triplets are supported/not supported? Have you updated the CI baseline?
unchanged, no.
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
Disclaimer.
No local tests were made.