Make git-describe find annotated and non-annotated tags

Change-Id: I56f67e9a0a69fce3c825577160ab7380c297d243

cmake_modules/utils.cmake

@@ -92,7 +92,7 @@ function(get_version DEFAULT_VERSION_STRING VERSION_PREFIX)
     find_program ( GIT NAMES git )
 
     if ( GIT )
-        execute_process ( COMMAND git describe --dirty --long --match ${VERSION_PREFIX}-[0-9.]*
+        execute_process ( COMMAND git describe --tags --dirty --long --match ${VERSION_PREFIX}-[0-9.]*
                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                           OUTPUT_VARIABLE GIT_TAG_STRING
                           OUTPUT_STRIP_TRAILING_WHITESPACE