Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/ai_idf_ver_fallback_when_no_git_v6.0' into 'release/v6.0'

Browse Source 
fix(cmake): Fall back to version from components when git describe fails (v6.0)

See merge request espressif/esp-idf!46027
This commit is contained in:
Jiang Jiang Jian
2026-03-20 10:34:25 +08:00
parent 88e7db86d5 90875ec492
commit d8c022123d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/cmake/build.cmake
+3 -1
View File
@@ -147,8 +147,10 @@ function(__build_get_idf_git_revision)
if(EXISTS "${idf_path}/version.txt")
file(STRINGS "${idf_path}/version.txt" idf_ver_t)
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${idf_path}/version.txt")
else()
elseif(idf_ver_git)
set(idf_ver_t ${idf_ver_git})
else()
set(idf_ver_t "v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}")
endif()
# cut IDF_VER to required 32 characters.
string(SUBSTRING "${idf_ver_t}" 0 31 idf_ver)