From 1cbd0ec4b4230dee5d4fd7ff23cac0c2dad3b3d3 Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Thu, 26 Nov 2015 20:33:05 +0100 Subject: [PATCH] Compilation fix for git ID (another try) --- companion/src/cmake/Macros.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/companion/src/cmake/Macros.cmake b/companion/src/cmake/Macros.cmake index 7ac492b8b..1dcf82587 100644 --- a/companion/src/cmake/Macros.cmake +++ b/companion/src/cmake/Macros.cmake @@ -26,10 +26,10 @@ ENDMACRO (NOW) MACRO (GIT_ID RESULT) IF (WIN32) - EXECUTE_PROCESS(COMMAND "cmd" " /C git -C ${RADIO_SRC_DIRECTORY} rev-parse HEAD" OUTPUT_VARIABLE ${RESULT}) + EXECUTE_PROCESS(COMMAND "cmd" " /C git --git-dir=${PROJECT_SOURCE_DIR}/../../.git rev-parse HEAD" OUTPUT_VARIABLE ${RESULT}) string(REGEX REPLACE "(..):(..).*" "\\1:\\2:00" ${RESULT} ${${RESULT}}) ELSEIF(UNIX) - EXECUTE_PROCESS(COMMAND "git" "-C" "${RADIO_SRC_DIRECTORY}" "rev-parse" "HEAD" OUTPUT_VARIABLE ${RESULT}) + EXECUTE_PROCESS(COMMAND "git" "--git-dir=${PROJECT_SOURCE_DIR}/../../.git" "rev-parse" "HEAD" OUTPUT_VARIABLE ${RESULT}) string(REGEX REPLACE "(.*)\n" "\\1" ${RESULT} ${${RESULT}}) ELSE (WIN32) MESSAGE(SEND_ERROR "Git ID implemented")