From 95dcfecedc9a67b02c99bebe0b877fd750a4ada8 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Wed, 22 May 2019 10:19:38 +1000 Subject: [PATCH] cmake: Project & IDF git revisions: Show un-annotated tags and -dirty flag Adds --tags and --dirty flags to cmake git_describe() calls, and not pass the HEAD commit hash (incompatible with --dirty) Makes IDF_VER output the same as in Make build system Thanks to @william-ferguson-au for reporting this: https://github.com/espressif/esp-idf/issues/3378#event-2355460974 --- tools/cmake/third_party/GetGitRevisionDescription.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/cmake/third_party/GetGitRevisionDescription.cmake b/tools/cmake/third_party/GetGitRevisionDescription.cmake index 51468b39b3..1de63b3623 100644 --- a/tools/cmake/third_party/GetGitRevisionDescription.cmake +++ b/tools/cmake/third_party/GetGitRevisionDescription.cmake @@ -113,7 +113,8 @@ function(git_describe _var _repo_dir) ${_repo_dir} describe "--always" - ${hash} + "--tags" + "--dirty" ${ARGN} WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" -- 2.40.0