Przeglądaj źródła

Merge branch 'bugfix/cmake_idf_version' into 'master'

cmake: prefer `version.txt` for IDF_VER if available

See merge request idf/esp-idf!3279
Angus Gratton 7 lat temu
rodzic
commit
df215d2f02
1 zmienionych plików z 5 dodań i 1 usunięć
  1. 5 1
      tools/cmake/idf_functions.cmake

+ 5 - 1
tools/cmake/idf_functions.cmake

@@ -213,7 +213,11 @@ endfunction()
 # Running git_describe() here automatically triggers rebuilds
 # if the ESP-IDF git version changes
 function(idf_get_git_revision)
-    git_describe(IDF_VER "${IDF_PATH}")
+    if(EXISTS "${IDF_PATH}/version.txt")
+        file(STRINGS "${IDF_PATH}/version.txt" IDF_VER)
+    else()
+        git_describe(IDF_VER "${IDF_PATH}")
+    endif()
     add_definitions(-DIDF_VER=\"${IDF_VER}\")
     git_submodule_check("${IDF_PATH}")
     set(IDF_VER ${IDF_VER} PARENT_SCOPE)