alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/improve-git-describe-handling-v5.1' into 'release/v5.1'

Browse Source 
build system: more accurate error information for git_describe (v5.1)

See merge request espressif/esp-idf!24665
This commit is contained in:
Zim Kalinowski 2023-07-11 17:07:40 +08:00
commit 819da74d9f
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/cmake/project.cmake
View File

@ -79,8 +79,7 @@ function(__project_get_revision var)
if(PROJECT_VER_GIT)
set(PROJECT_VER ${PROJECT_VER_GIT})
else()
message(STATUS "Project is not inside a git repository, or git repository has no commits;"
" will not use 'git describe' to determine PROJECT_VER.")
message(STATUS "Could not use 'git describe' to determine PROJECT_VER.")
set(PROJECT_VER 1)
endif()
endif()

10
tools/cmake/third_party/GetGitRevisionDescription.cmake vendored
View File

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