Merge branch 'bugfix/git_describe_cmake' into 'master'

projectgus · projectgus · commit e3045d9a6397 · 2021-02-28T23:29:07.000Z
build system: fix NOTFOUND git version error

See merge request espressif/esp-idf!12526
diff --git a/tools/cmake/build.cmake b/tools/cmake/build.cmake
@@ -64,7 +64,7 @@ endfunction()
 #
 function(__build_get_idf_git_revision)
     idf_build_get_property(idf_path IDF_PATH)
-    git_describe(idf_ver_git "${idf_path}" "--match v*.*")
+    git_describe(idf_ver_git "${idf_path}" "--match=v*.*")
     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")

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ endfunction()`
`64`	`64`	`#`
`65`	`65`	`function(__build_get_idf_git_revision)`
`66`	`66`	`idf_build_get_property(idf_path IDF_PATH)`
`67`		`- git_describe(idf_ver_git "${idf_path}" "--match v.")`
	`67`	`+ git_describe(idf_ver_git "${idf_path}" "--match=v.")`
`68`	`68`	`if(EXISTS "${idf_path}/version.txt")`
`69`	`69`	`file(STRINGS "${idf_path}/version.txt" idf_ver_t)`
`70`	`70`	`set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${idf_path}/version.txt")`