espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

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

See merge request espressif/esp-idf!24668
This commit is contained in:
Zim Kalinowski
2023-07-11 17:06:44 +08:00
parent 8fa72ec3b7 56994aeb0b
commit 36de1ba9c8
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/cmake/project.cmake
View File

@ -62,8 +62,7 @@ function(__project_get_revision var)
if(PROJECT_VER_GIT) if(PROJECT_VER_GIT)
set(PROJECT_VER ${PROJECT_VER_GIT}) set(PROJECT_VER ${PROJECT_VER_GIT})
else() else()
message(STATUS "Project is not inside a git repository, or git repository has no commits;" message(STATUS "Could not use 'git describe' to determine PROJECT_VER.")
" will not use 'git describe' to determine PROJECT_VER.")
set(PROJECT_VER 1) set(PROJECT_VER 1)
endif() endif()
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 res
OUTPUT_VARIABLE OUTPUT_VARIABLE
GIT_DIR GIT_DIR
ERROR_QUIET ERROR_VARIABLE
error
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
if(NOT res EQUAL 0) if(NOT res EQUAL 0)
string(STRIP "${error}" error)
message(STATUS "git rev-parse returned '${error}'")
return() return()
endif() endif()
@ -123,9 +126,12 @@ function(git_describe _var _repo_dir)
res res
OUTPUT_VARIABLE OUTPUT_VARIABLE
out out
ERROR_QUIET ERROR_VARIABLE
error
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
if(NOT res EQUAL 0) if(NOT res EQUAL 0)
string(STRIP "${error}" error)
message(STATUS "git describe returned '${error}'")
set(out "${out}-${res}-NOTFOUND") set(out "${out}-${res}-NOTFOUND")
endif() endif()