From ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70 Mon Sep 17 00:00:00 2001 From: irimi Date: Mon, 7 Mar 2016 20:28:21 +0100 Subject: [PATCH] ensure correct git repository path --- CMakeLists.txt | 2 +- getgit.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d3113f4..8532ab4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,7 +152,7 @@ FIND_PROGRAM(GIT_EXECUTABLE git DOC "git command line client") MACRO(Gitversion_GET_REVISION dir variable) - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count + EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-list HEAD --count WORKING_DIRECTORY ${dir} OUTPUT_VARIABLE ${variable} OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/getgit.cmake b/getgit.cmake index 8d6821f..39af19b 100644 --- a/getgit.cmake +++ b/getgit.cmake @@ -8,28 +8,28 @@ if(NOT GIT_FOUND) endif() MACRO(Gitversion_GET_REVISION dir variable) - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count + EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-list HEAD --count WORKING_DIRECTORY ${dir} OUTPUT_VARIABLE ${variable} OUTPUT_STRIP_TRAILING_WHITESPACE) ENDMACRO(Gitversion_GET_REVISION) MACRO(Gitversion_GET_HASH dir variable) - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD + EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-parse --short HEAD WORKING_DIRECTORY ${dir} OUTPUT_VARIABLE ${variable} OUTPUT_STRIP_TRAILING_WHITESPACE) ENDMACRO(Gitversion_GET_HASH) MACRO(Gitversion_GET_DATE dir variable) - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} show -s --format=%ct + EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git show -s --format=%ct WORKING_DIRECTORY ${dir} OUTPUT_VARIABLE ${variable} OUTPUT_STRIP_TRAILING_WHITESPACE) ENDMACRO(Gitversion_GET_DATE) MACRO(Gitversion_CHECK_DIRTY dir variable) - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} diff-index -m --name-only HEAD + EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git diff-index -m --name-only HEAD WORKING_DIRECTORY ${dir} OUTPUT_VARIABLE ${variable} OUTPUT_STRIP_TRAILING_WHITESPACE)