piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fix for git ID (another try)

Browse Source
This commit is contained in:
Damjan Adamic
2015-11-26 20:33:05 +01:00
parent dc2d2e1f2e
commit 1cbd0ec4b4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/cmake/Macros.cmake
+2 -2
View File
@@ -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")