Thanks to visit codestin.com
Credit goes to github.com

Skip to content

cmake: support 10+ minor version(10,11,...) #25803

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jun 22, 2024
Merged

cmake: support 10+ minor version(10,11,...) #25803

merged 1 commit into from
Jun 22, 2024

Conversation

@Kumataro
Copy link
Contributor

@Kumataro Kumataro commented Jun 22, 2024

Close #25802

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
  • The PR is proposed to the proper branch
  • There is a reference to the original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

@Kumataro
Copy link
Contributor Author

Kumataro commented Jun 22, 2024 •
edited
Loading

After fix, we can get following Version Control line, which is support 10+ minor version.

-- General configuration for OpenCV 4.10.0-dev =====================================
--   Version control:               4.10.0-47-gd8c7debe52
--
--   Platform:
--     Timestamp:                   2024-06-22T02:17:04Z
--     Host:                        Linux 6.8.0-35-generic x86_64

Following are my test result at 4.x branch(not merged this patch).

kmtr@kmtr-VMware-Virtual-Platform:~/work/opencv4$ git reset --hard
HEAD is now at 3f13ce797b Merge pull request #25779 from fengyuentau:dnn/fix_onnx_depthtospace
kmtr@kmtr-VMware-Virtual-Platform:~/work/opencv4$ git describe --tags --exact-match --dirty
fatal: no tag exactly matches '3f13ce797b89b4bc83a3caddc682ea2158c3f32c'
kmtr@kmtr-VMware-Virtual-Platform:~/work/opencv4$ git describe --tags --always --dirty --match "[0-9].[0-9].[0-9]*" --exclude "[^-]*-cvsdk"
4.9.0-595-g3f13ce797b
kmtr@kmtr-VMware-Virtual-Platform:~/work/opencv4$ git describe --tags --always --dirty --match "[0-9].[0-9]*.[0-9]*"
--exclude "[^-]*-cvsdk"
4.10.0-46-g3f13ce797b

@opencv-alalek opencv-alalek added this to the 4.11.0 milestone Jun 22, 2024
@asmorkalov asmorkalov self-assigned this Jun 22, 2024
@asmorkalov asmorkalov merged commit 2028998 into opencv:4.x Jun 22, 2024
@asmorkalov asmorkalov mentioned this pull request Jul 1, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@asmorkalov asmorkalov asmorkalov approved these changes

Assignees

@asmorkalov asmorkalov

Labels

bug category: build/install

Projects

None yet

Milestone

4.11.0

Development

Successfully merging this pull request may close these issues.

build: Version control line cannot handle 10+ minor version

3 participants

@Kumataro @asmorkalov @opencv-alalek