build system: more accurate error information for git_describe
Closes https://github.com/espressif/esp-idf/issues/9071 See merge request espressif/esp-idf!23891
This commit is contained in:
+8
-2
@@ -53,10 +53,13 @@ function(get_git_head_revision _refspecvar _hashvar _repo_dir)
|
||||
res
|
||||
OUTPUT_VARIABLE
|
||||
GIT_DIR
|
||||
ERROR_QUIET
|
||||
ERROR_VARIABLE
|
||||
error
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
|
||||
if(NOT res EQUAL 0)
|
||||
string(STRIP "${error}" error)
|
||||
message(STATUS "git rev-parse returned '${error}'")
|
||||
return()
|
||||
endif()
|
||||
|
||||
@@ -123,9 +126,12 @@ function(git_describe _var _repo_dir)
|
||||
res
|
||||
OUTPUT_VARIABLE
|
||||
out
|
||||
ERROR_QUIET
|
||||
ERROR_VARIABLE
|
||||
error
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
if(NOT res EQUAL 0)
|
||||
string(STRIP "${error}" error)
|
||||
message(STATUS "git describe returned '${error}'")
|
||||
set(out "${out}-${res}-NOTFOUND")
|
||||
endif()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user