diff --git a/AUTHORS b/AUTHORS index cccde3d7..6e7dd41a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -25,3 +25,4 @@ Paul Redmond Shuo Chen Yusuke Suzuki Dirac Research +Zbigniew Skowron diff --git a/CONTRIBUTORS b/CONTRIBUTORS index ea0f555f..b991c4d9 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -41,3 +41,4 @@ Pierre Phaneuf Shuo Chen Yusuke Suzuki Tobias Ulvgård +Zbigniew Skowron diff --git a/cmake/GetGitVersion.cmake b/cmake/GetGitVersion.cmake index c49e3089..8dd94800 100644 --- a/cmake/GetGitVersion.cmake +++ b/cmake/GetGitVersion.cmake @@ -20,7 +20,7 @@ set(__get_git_version INCLUDED) function(get_git_version var) if(GIT_EXECUTABLE) - execute_process(COMMAND git describe --match "v[0-9]*.[0-9]*.[0-9]*" --abbrev=8 + execute_process(COMMAND ${GIT_EXECUTABLE} describe --match "v[0-9]*.[0-9]*.[0-9]*" --abbrev=8 RESULT_VARIABLE status OUTPUT_VARIABLE GIT_VERSION ERROR_QUIET) @@ -30,22 +30,22 @@ function(get_git_version var) string(STRIP ${GIT_VERSION} GIT_VERSION) string(REGEX REPLACE "-[0-9]+-g" "-" GIT_VERSION ${GIT_VERSION}) endif() + + # Work out if the repository is dirty + execute_process(COMMAND ${GIT_EXECUTABLE} update-index -q --refresh + OUTPUT_QUIET + ERROR_QUIET) + execute_process(COMMAND ${GIT_EXECUTABLE} diff-index --name-only HEAD -- + OUTPUT_VARIABLE GIT_DIFF_INDEX + ERROR_QUIET) + string(COMPARE NOTEQUAL "${GIT_DIFF_INDEX}" "" GIT_DIRTY) + if (${GIT_DIRTY}) + set(GIT_VERSION "${GIT_VERSION}-dirty") + endif() else() set(GIT_VERSION "v0.0.0") endif() - - # Work out if the repository is dirty - execute_process(COMMAND git update-index -q --refresh - OUTPUT_QUIET - ERROR_QUIET) - execute_process(COMMAND git diff-index --name-only HEAD -- - OUTPUT_VARIABLE GIT_DIFF_INDEX - ERROR_QUIET) - string(COMPARE NOTEQUAL "${GIT_DIFF_INDEX}" "" GIT_DIRTY) - if (${GIT_DIRTY}) - set(GIT_VERSION "${GIT_VERSION}-dirty") - endif() message("-- git Version: ${GIT_VERSION}") set(${var} ${GIT_VERSION} PARENT_SCOPE) endfunction()