Merge pull request #25803 from Kumataro/fix25802

cmake: support 10+ minor version(10,11,...)
pull/25337/head
Alexander Smorkalov 5 months ago committed by GitHub
commit 2028998e00
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      cmake/OpenCVUtils.cmake

@ -1992,7 +1992,7 @@ macro(ocv_git_describe var_name path)
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if(NOT GIT_RESULT EQUAL 0)
execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always --dirty --match "[0-9].[0-9].[0-9]*" --exclude "[^-]*-cvsdk"
execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always --dirty --match "[0-9].[0-9]*.[0-9]*" --exclude "[^-]*-cvsdk"
WORKING_DIRECTORY "${path}"
OUTPUT_VARIABLE ${var_name}
RESULT_VARIABLE GIT_RESULT

Loading…
Cancel
Save