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

[opencv] Fixed OpenCV versioning using wrong commit #6812

Merged
merged 2 commits into from Jun 18, 2019

Conversation

PhilLab
Copy link
Contributor

@PhilLab PhilLab commented Jun 7, 2019

As there is no OpenCV repository, the hash is wrongly determined

Closes #6708

Open point: #6708 (comment)

Unfortunately, there is no similar way to workaround opencv_contrib git hashes (they are not collected from the git-"rooted" path in general, so proposed above workaround doesn't work at all even without vcpkg):

* turn off information about them completely via `BUILD_INFO_SKIP_EXTRA_MODULES=ON`

* or disable "find_package(Git)" via CMake's: `CMAKE_DISABLE_FIND_PACKAGE_Git=ON` (should work if it is new "CMake" process)

As there is no OpenCV repository, the hash is wrongly determined

Closes microsoft#6708
@ras0219-msft
Copy link
Contributor

Thanks for the PR!

I think that CMAKE_DISABLE_FIND_PACKAGE_Git=ON is a better approach in this case, since it increases maintenance burden to add another field that needs to be updated. Could you change this PR to pass that option instead?

@dan-shaw dan-shaw merged commit 99b3907 into microsoft:master Jun 18, 2019
@dan-shaw
Copy link
Contributor

Thanks for the PR!

cenit added a commit to cenit/vcpkg that referenced this pull request Jun 19, 2019
@PhilLab PhilLab deleted the opencvGitVersioning branch June 24, 2019 14:02
vicroms pushed a commit that referenced this pull request Aug 12, 2019
* [OpenCV] update to v4

* [OpenCV] update to v4.1

* [OpenCV] merge #6901 and #6812

* [OpenCV] port patches to v4.1

* [OpenCV] fix naming

* [OpenCV] fix regression with static linkage

* [OpenCV] fix linking to optional feature dependencies in static mode

* fix ffmpeg on some architectures

* trigger rebuild of regressions on macOS

* [zxing-cpp] fix opencv 4.1 compat

* [ogre] improve patching for static builds

* [OpenCV] fixes for extra features

* [OpenCV] drastically reduce patchset

* [OpenCV] fix regression on linux

* [OpenCV] fix regression on Windows

* [qt5] depends on qt5-activeqt only on windows

* update to v4.1.1

* [OpenCV] additional fixes for 4.1.1

* [OpenCV] fix Eigen3 feature integration

* [opencv] Fix compilation in UWP

* [opencv] Fix merge conflicts

* [ffmpeg] fix cmake module for osx

* [OpenCV] add pre-caching of optflow cuda package

* [gdcm] properly fix #6863 instead of wrong #6901

* [OpenCV] fix OpenMP feature

* [opencv] Add missing GetModuleHandle() call guard for UWP

* [freeimage] Do not depend on libwebp[all] on UWP

* [opencv] Set app container bit for UWP

* [zxing-cpp] Fail with explicit message in UWP

* [pthreads4w] fix target creation, missing dlls

* [pthreads4w] bump CONTROL

* [opencv,zxing-cpp] Fix OpenCV Video IO module

* [zxing-cpp] Revert unnecessary changes

* [opencv] Feature halide

* Fix regression in UWP

* [ffmpeg] remove unnecessary patch pointing to old OpenCV version

* [opencv] remove versioning from windows dll filenames

* [opencv] Move port to opencv4

* [opencv,opencv4] Make meta-package install OpenCV 4.1

* [opencv3] Rename old port opencv->opencv3

* Add failure messages when another OpenCV is already installed
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.

OpenCV 3.4.3: checked out commit is not in upstream
3 participants