From d2155ef08938d65834ee87cb6cb43442912b39f8 Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Thu, 26 Nov 2015 21:11:05 +0100 Subject: [PATCH] Fixes for Windows build --- companion/src/cmake/Macros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/companion/src/cmake/Macros.cmake b/companion/src/cmake/Macros.cmake index 1dcf82587..a39618558 100644 --- a/companion/src/cmake/Macros.cmake +++ b/companion/src/cmake/Macros.cmake @@ -27,7 +27,7 @@ ENDMACRO (NOW) MACRO (GIT_ID RESULT) IF (WIN32) 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}}) + string(REGEX REPLACE "(.*)\n" "\\1" ${RESULT} ${${RESULT}}) ELSEIF(UNIX) EXECUTE_PROCESS(COMMAND "git" "--git-dir=${PROJECT_SOURCE_DIR}/../../.git" "rev-parse" "HEAD" OUTPUT_VARIABLE ${RESULT}) string(REGEX REPLACE "(.*)\n" "\\1" ${RESULT} ${${RESULT}})