|
|
@ -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 |
|
|
|