Skip to content

Commit ab5a11f

Browse files
committed
Merge pull request #548 from irimitenkan/master
ensure correct git repository path #539
2 parents 6c3d684 + ca371a9 commit ab5a11f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ FIND_PROGRAM(GIT_EXECUTABLE git
152152
DOC "git command line client")
153153

154154
MACRO(Gitversion_GET_REVISION dir variable)
155-
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count
155+
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-list HEAD --count
156156
WORKING_DIRECTORY ${dir}
157157
OUTPUT_VARIABLE ${variable}
158158
OUTPUT_STRIP_TRAILING_WHITESPACE)

getgit.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,28 @@ if(NOT GIT_FOUND)
88
endif()
99

1010
MACRO(Gitversion_GET_REVISION dir variable)
11-
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count
11+
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-list HEAD --count
1212
WORKING_DIRECTORY ${dir}
1313
OUTPUT_VARIABLE ${variable}
1414
OUTPUT_STRIP_TRAILING_WHITESPACE)
1515
ENDMACRO(Gitversion_GET_REVISION)
1616

1717
MACRO(Gitversion_GET_HASH dir variable)
18-
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
18+
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-parse --short HEAD
1919
WORKING_DIRECTORY ${dir}
2020
OUTPUT_VARIABLE ${variable}
2121
OUTPUT_STRIP_TRAILING_WHITESPACE)
2222
ENDMACRO(Gitversion_GET_HASH)
2323

2424
MACRO(Gitversion_GET_DATE dir variable)
25-
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} show -s --format=%ct
25+
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git show -s --format=%ct
2626
WORKING_DIRECTORY ${dir}
2727
OUTPUT_VARIABLE ${variable}
2828
OUTPUT_STRIP_TRAILING_WHITESPACE)
2929
ENDMACRO(Gitversion_GET_DATE)
3030

3131
MACRO(Gitversion_CHECK_DIRTY dir variable)
32-
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} diff-index -m --name-only HEAD
32+
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git diff-index -m --name-only HEAD
3333
WORKING_DIRECTORY ${dir}
3434
OUTPUT_VARIABLE ${variable}
3535
OUTPUT_STRIP_TRAILING_WHITESPACE)

0 commit comments

Comments
 (0)