Преглед изворни кода

Merge branch 'bugfix/git_describe_cmake' into 'master'

build system: fix NOTFOUND git version error

See merge request espressif/esp-idf!12526
Angus Gratton пре 5 година
родитељ
комит
e3045d9a63
1 измењених фајлова са 1 додато и 1 уклоњено
  1. 1 1
      tools/cmake/build.cmake

+ 1 - 1
tools/cmake/build.cmake

@@ -64,7 +64,7 @@ endfunction()
 #
 #
 function(__build_get_idf_git_revision)
 function(__build_get_idf_git_revision)
     idf_build_get_property(idf_path IDF_PATH)
     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")
     if(EXISTS "${idf_path}/version.txt")
         file(STRINGS "${idf_path}/version.txt" idf_ver_t)
         file(STRINGS "${idf_path}/version.txt" idf_ver_t)
         set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${idf_path}/version.txt")
         set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${idf_path}/version.txt")