mirror of
https://github.com/opencv/opencv.git
synced 2025-06-10 19:24:07 +08:00
cmake: support 10+ minor version(10,11,...)
This commit is contained in:
parent
3f13ce797b
commit
d8c7debe52
@ -1992,7 +1992,7 @@ macro(ocv_git_describe var_name path)
|
|||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
)
|
)
|
||||||
if(NOT GIT_RESULT EQUAL 0)
|
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}"
|
WORKING_DIRECTORY "${path}"
|
||||||
OUTPUT_VARIABLE ${var_name}
|
OUTPUT_VARIABLE ${var_name}
|
||||||
RESULT_VARIABLE GIT_RESULT
|
RESULT_VARIABLE GIT_RESULT
|
||||||
|
Loading…
Reference in New Issue
Block a user