Prechádzať zdrojové kódy

Merge branch 'bugfix/cmake_git_describe' into 'master'

cmake: Project & IDF git revisions: Show un-annotated tags and -dirty flag

See merge request idf/esp-idf!5042
Angus Gratton 6 rokov pred
rodič
commit
c879aff6f5

+ 2 - 1
tools/cmake/third_party/GetGitRevisionDescription.cmake

@@ -113,7 +113,8 @@ function(git_describe _var _repo_dir)
 		${_repo_dir}
 		${_repo_dir}
 		describe
 		describe
 		"--always"
 		"--always"
-		${hash}
+		"--tags"
+		"--dirty"
 		${ARGN}
 		${ARGN}
 		WORKING_DIRECTORY
 		WORKING_DIRECTORY
 		"${CMAKE_CURRENT_SOURCE_DIR}"
 		"${CMAKE_CURRENT_SOURCE_DIR}"