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

[opencv4,opencv3] Control exported protobuf dependency #20550

Merged
merged 4 commits into from
Oct 6, 2021

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Oct 6, 2021

Disclaimer.
No local tests were made.

@dg0yt dg0yt changed the title Opencv4 [opencv4] Control exported protobuf dependency Oct 6, 2021
@dg0yt
Copy link
Contributor Author

dg0yt commented Oct 6, 2021

CC @autoantwort @horenmar for review/test.

@autoantwort
Copy link
Contributor

Yeah fixes #20366 👍

@horenmar
Copy link
Contributor

horenmar commented Oct 6, 2021

lgtm

@cenit
Copy link
Contributor

cenit commented Oct 6, 2021

same identical fix must be applied to opencv3.
Can you please do it also there?

@dg0yt dg0yt changed the title [opencv4] Control exported protobuf dependency [opencv4,opencv3] Control exported protobuf dependency Oct 6, 2021
@dg0yt
Copy link
Contributor Author

dg0yt commented Oct 6, 2021

same identical fix must be applied to opencv3. Can you please do it also there?

Done, with different feature name.

@strega-nil-ms
Copy link
Contributor

LGTM, thanks @dg0yt :)

@strega-nil-ms strega-nil-ms merged commit 15af003 into microsoft:master Oct 6, 2021
@dg0yt dg0yt deleted the opencv4 branch October 7, 2021 05:48
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[zxing-cpp] build failure
5 participants