Merge pull request #208 from sumoprojects/dev

[CMAKE] Make tagged-commit compatible with 9-char, commit-based versioning
sumoprojects · Jun 17, 2019 · 74bc4a5 · 74bc4a5
2 parents b20d915 + 12ce3c2
commit 74bc4a5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cmake/GenVersion.cmake b/cmake/GenVersion.cmake
@@ -42,7 +42,7 @@ else()
 	message(STATUS "You are currently on commit ${COMMIT}")
 
 	# Get all the tags
-	execute_process(COMMAND "${GIT}" rev-list --tags --max-count=1 --abbrev-commit RESULT_VARIABLE RET OUTPUT_VARIABLE TAGGEDCOMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
+	execute_process(COMMAND "${GIT}" rev-list --tags --max-count=1 --abbrev=9 --abbrev-commit RESULT_VARIABLE RET OUTPUT_VARIABLE TAGGEDCOMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
 
     if(NOT TAGGEDCOMMIT)
         message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.")