diff options
| author | jkoan <jkoan@users.noreply.github.com> | 2018-03-08 20:51:28 +0100 |
|---|---|---|
| committer | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2018-03-08 11:51:28 -0800 |
| commit | e66370b01e54c2f38aac63e686a859fcc0cb9771 (patch) | |
| tree | 6be6e7afe9ac3f5d97634cd00779b8818aec0be2 /cmake | |
| parent | 63cb676e52755f50fa19d5a3fae3a7ae26043acf (diff) | |
| download | navit-e66370b01e54c2f38aac63e686a859fcc0cb9771.tar.gz | |
fix:cmake:Fix getting the version from git to fix the wince build (#408)
Diffstat (limited to 'cmake')
| -rwxr-xr-x | cmake/version.cmake | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/cmake/version.cmake b/cmake/version.cmake index 41c654d33..e87806c54 100755 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -12,23 +12,22 @@ if (GIT_EXECUTABLE) OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE ) - if(NOT GIT_OUTPUT_DATE) + if(GIT_ERROR) message(STATUS "Cannot determine current git commit - git error: '${GIT_ERROR}'") set(GIT_OUTPUT_DATE "0000000000") - else() - EXECUTE_PROCESS( - COMMAND ${GIT_EXECUTABLE} log "--format='%h'" - WORKING_DIRECTORY "${SOURCE_DIR}" - OUTPUT_VARIABLE GIT_OUTPUT_HASH - ERROR_VARIABLE GIT_ERROR - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_STRIP_TRAILING_WHITESPACE - ) - if(NOT GIT_OUTPUT_HASH) - message(STATUS "Cannot determine current git commit - git error: '${GIT_ERROR}'") - set(GIT_OUTPUT_HASH "xdevxgitxnotxfound") - endif(NOT GIT_OUTPUT_HASH) - endif(NOT GIT_OUTPUT_DATE) + endif(GIT_ERROR) + EXECUTE_PROCESS( + COMMAND ${GIT_EXECUTABLE} log "--format='%h'" + WORKING_DIRECTORY "${SOURCE_DIR}" + OUTPUT_VARIABLE GIT_OUTPUT_HASH + ERROR_VARIABLE GIT_ERROR_HASH + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_STRIP_TRAILING_WHITESPACE + ) + if(GIT_ERROR_HASH) + message(STATUS "Cannot determine current git hash - git error: '${GIT_ERROR}'") + set(GIT_OUTPUT_HASH "xdevxgitxnotxfound") + endif(GIT_ERROR_HASH) else() message(STATUS "git not found, cannot record git commit") set(GIT_OUTPUT_DATE "0000000000") # To match length of android versionCode @@ -37,6 +36,8 @@ endif(GIT_EXECUTABLE) string(REGEX MATCH "^[0-9]+" VERSION_NUM ${GIT_OUTPUT_DATE} ) +set(VERSION ${GIT_OUTPUT_HASH}) + EXECUTE_PROCESS( COMMAND ${DATE_EXECUTABLE} "+%y%m%d%H%M" "-d \@${VERSION_NUM}" # output as unix timestamp WORKING_DIRECTORY "${SOURCE_DIR}" |