From: Alexander Schmidt Date: Fri, 23 Oct 2015 21:48:13 +0000 (+0200) Subject: formatting X-Git-Url: http://git.treefish.org/~alex/cmake-modules/cmake-getgitversion.git/commitdiff_plain/21bbda38d5a8b7eda1b0003ca04c2c235e5f30ca?ds=inline formatting --- diff --git a/GetGitVersion.cmake b/GetGitVersion.cmake index e673152..202fbf3 100644 --- a/GetGitVersion.cmake +++ b/GetGitVersion.cmake @@ -1,4 +1,4 @@ -# __________________________________________________________________________ __ _ +# __________________________________________________________________________________ __ _ # get_git_version: # Obtain version string from git tags via git_describe and parse result into # convenient version variables. @@ -20,18 +20,24 @@ # wrote this file. As long as you retain this notice # you can do whatever you want with this stuff. If we meet some day, and you # think this stuff is worth it, you can buy me a beer in return. -# __________________________________________________________________________ __ _ +# __________________________________________________________________________________ __ _ function(get_git_version _gitversionprefix) include(GetGitRevisionDescription) git_describe(GIT_DESCRIPTION ${ARGN}) - string(REGEX REPLACE "^[^0-9]*([0-9]+)\\..*" "\\1" VERSION_MAJOR "${GIT_DESCRIPTION}") - string(REGEX REPLACE "^[^0-9]*[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${GIT_DESCRIPTION}") - string(REGEX REPLACE "^[^0-9]*[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${GIT_DESCRIPTION}") - string(REGEX REPLACE "^[^0-9]*[0-9]+\\.[0-9]+\\.[0-9]+-(.*)" "\\1" VERSION_EXTRA "${GIT_DESCRIPTION}") - string(REGEX REPLACE "([^-]*-g)" "r\\1" VERSION_EXTRA "${VERSION_EXTRA}") - string(REGEX REPLACE "-" "." VERSION_EXTRA "${VERSION_EXTRA}") + string(REGEX REPLACE + "^[^0-9]*([0-9]+)\\..*" "\\1" VERSION_MAJOR "${GIT_DESCRIPTION}") + string(REGEX REPLACE + "^[^0-9]*[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${GIT_DESCRIPTION}") + string(REGEX REPLACE + "^[^0-9]*[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${GIT_DESCRIPTION}") + string(REGEX REPLACE + "^[^0-9]*[0-9]+\\.[0-9]+\\.[0-9]+-(.*)" "\\1" VERSION_EXTRA "${GIT_DESCRIPTION}") + string(REGEX REPLACE + "([^-]*-g)" "r\\1" VERSION_EXTRA "${VERSION_EXTRA}") + string(REGEX REPLACE + "-" "." VERSION_EXTRA "${VERSION_EXTRA}") set(${_gitversionprefix}_MAJOR "${VERSION_MAJOR}" PARENT_SCOPE) set(${_gitversionprefix}_MINOR "${VERSION_MINOR}" PARENT_SCOPE)