commit cd2e633fe5527020801a7198ecd096bf72ef33d1
author Zbigniew Skowron <zbychs@gmail.com> Sun Oct 18 02:13:37 2015 +0200
committer Zbigniew Skowron <zbychs@gmail.com> Sun Oct 18 02:13:37 2015 +0200
tree 1479b5ff7eaeb858ee05e00928fb3c96ce0e8116
parent 559c71d840876783e071569b5e6a3863a8c44ae3

Fix get_git_version to use GIT_EXECUTABLE.

get_git_version CMake function uses 'git' command directly, instead of
GIT_EXECUTABLE variable. This causes CMake errors while generating
project files in environments, where 'git' command is not present
in PATH.

AUTHORS

diff --git a/AUTHORS b/AUTHORS
index cccde3d..6e7dd41 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,3 +25,4 @@
 Shuo Chen <chenshuo@chenshuo.com>
 Yusuke Suzuki <utatane.tea@gmail.com>
 Dirac Research 
+Zbigniew Skowron <zbychs@gmail.com>

CONTRIBUTORS

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ea0f555..b991c4d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -41,3 +41,4 @@
 Shuo Chen <chenshuo@chenshuo.com>
 Yusuke Suzuki <utatane.tea@gmail.com>
 Tobias Ulvgård <tobias.ulvgard@dirac.se>
+Zbigniew Skowron <zbychs@gmail.com>

cmake/GetGitVersion.cmake

diff --git a/cmake/GetGitVersion.cmake b/cmake/GetGitVersion.cmake
index c49e308..8dd9480 100644
--- a/cmake/GetGitVersion.cmake
+++ b/cmake/GetGitVersion.cmake
@@ -20,7 +20,7 @@
 
 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 @@
           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()