[tesseract]: find_package(lz4) in TesseractConfig.cmake#15180
[tesseract]: find_package(lz4) in TesseractConfig.cmake#15180mheyman wants to merge 4 commits intomicrosoft:masterfrom mheyman:master
Conversation
NancyLi1013
left a comment
There was a problem hiding this comment.
Could you please also bump the Port-Version in CONTROL file?
|
It seems like
Could you please help confirm and try? |
… and opencv needs to have lz4::lz4 available
|
I updated libarchive to have a simple libarchiveConfig.cmake that tesseract could depend on. Now opencv4 can use lz4::lz4 because it does a find_package(tesseract) which does a find_package(libarchive) which does a find_package(lz4). portfile version numbers also bumped. |
|
#15089 ? |
|
if this one gets merged, I will fix mine to still enhance CI coverage for the future... we cannot have these problems slip in again :) |
|
also, because you are using a find_package(libarchive), you can remove many find_packages in the tesseractConfig.cmake which were just transitively added from libarchive. |
|
I updated these changes also in #15089 because you're right, it was not tesseract directly depending on lz4 but its dependency libarchive is. |
|
Thanks for instant response and also for your hard work. Since this PR includes the same change as PR #15089. Could you please revert this changes in this PR and only add I'm so sorry for my poor consideration, which leads you to do repeated work. |
… tesseract downstream and unblock opencv CI (#15089) * [tesseract] add missing reference for downstream projects * [tesseract] restore ci, fix many regressions that are uncovered by that * Update ports/opencv2/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [opencv] fix regressions on uwp, accept failure on arm64 for now * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [opencv4] allow failures on all arm windows targets, both win32 and uwp * adopts hints from #15180 * [libarchive] bump control version * [libarchive] use vcpkg-cmake-wrapper instead of a custom libarchiveConfig, since it is vcpkg-provided and not port-provided * enable features to be visible in parent scope * apply documentation fix from CI * [libarchive] remove unnecessary lines in portfile * fix regressions * Update ports/gdcm/CONTROL * use more compact logic syntax * add new versions to baseline Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* [tesseract] add missing reference for downstream projects * [tesseract] restore ci, fix many regressions that are uncovered by that * Update ports/opencv2/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [opencv] fix regressions on uwp, accept failure on arm64 for now * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [opencv4] allow failures on all arm windows targets, both win32 and uwp * [OpenCV] update to v4.5, draft * Restore CI tests on arm architectures, they will have to work! * adopts hints from #15180 * [libarchive] bump control version * [libarchive] use vcpkg-cmake-wrapper instead of a custom libarchiveConfig, since it is vcpkg-provided and not port-provided * enable features to be visible in parent scope * apply documentation fix from CI * [libarchive] remove unnecessary lines in portfile * update patches * restore ci tests for all opencv4 configs * add port versions to baseline * [OpenCV contrib] fix glog integration * [OpenCV4] fix target processor detection * update version refs * [OpenCV3] fix target processor detection * fix also ocv3 * remove vtk feature from opencv-ci testing * remove qt5-tools from baseline, it works locally Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
This fixes an issue I was having with building opencv4[contrib]. OpenCV[contrib] uses tesseract and tesseract uses lz4 but doesn't make the lz4:lz4 target available. It does make targets for other dependencies available so I figured this small change was okay..