diff options
| author | h.udo <hudokkow@gmail.com> | 2016-04-20 14:05:03 +0100 |
|---|---|---|
| committer | h.udo <hudokkow@gmail.com> | 2016-04-24 15:18:01 +0100 |
| commit | 3449cc3fcd1df65490da9420fa673b52655d81de (patch) | |
| tree | c708bd4fa668c6af8c18c6f220eef749df6cb895 | |
| parent | b62581064315768650e021a5c008a256d44f2dfe (diff) | |
[cmake] Remove core_find_git_rev() dead code and print 'nogitfound' if .git dir is missing
| -rw-r--r-- | project/cmake/scripts/common/macros.cmake | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/project/cmake/scripts/common/macros.cmake b/project/cmake/scripts/common/macros.cmake index e5eab4b343..9eb59f2974 100644 --- a/project/cmake/scripts/common/macros.cmake +++ b/project/cmake/scripts/common/macros.cmake @@ -319,22 +319,15 @@ macro(today RESULT) endmacro() function(core_find_git_rev) -# this is dead code. It should be version.txt -# revisit later after some more light reading about cmake's string parsing -# and filtering. - if(EXISTS ${CORE_SOURCE_DIR}/VERSION) - file(STRINGS ${CORE_SOURCE_DIR}/VERSION VERSION_FILE) - string(SUBSTRING "${VERSION_FILE}" 1 16 GIT_REV) - else() - find_package(Git) - if(GIT_FOUND AND EXISTS ${CORE_SOURCE_DIR}/.git) - execute_process(COMMAND ${GIT_EXECUTABLE} diff-files --ignore-submodules --quiet -- - RESULT_VARIABLE status_code - WORKING_DIRECTORY ${CORE_SOURCE_DIR}) + find_package(Git) + if(GIT_FOUND AND EXISTS ${CORE_SOURCE_DIR}/.git) + execute_process(COMMAND ${GIT_EXECUTABLE} diff-files --ignore-submodules --quiet -- + RESULT_VARIABLE status_code + WORKING_DIRECTORY ${CORE_SOURCE_DIR}) if (NOT status_code) execute_process(COMMAND ${GIT_EXECUTABLE} diff-index --ignore-submodules --quiet HEAD -- - RESULT_VARIABLE status_code - WORKING_DIRECTORY ${CORE_SOURCE_DIR}) + RESULT_VARIABLE status_code + WORKING_DIRECTORY ${CORE_SOURCE_DIR}) endif() if (status_code) execute_process(COMMAND ${GIT_EXECUTABLE} log -n 1 --pretty=format:"%h-dirty" HEAD @@ -347,16 +340,16 @@ function(core_find_git_rev) WORKING_DIRECTORY ${CORE_SOURCE_DIR}) string(SUBSTRING ${HASH} 1 7 HASH) endif() - execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --pretty=format:"%cd" --date=short HEAD - OUTPUT_VARIABLE DATE - WORKING_DIRECTORY ${CORE_SOURCE_DIR}) - string(SUBSTRING ${DATE} 1 10 DATE) - else() + execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --pretty=format:"%cd" --date=short HEAD + OUTPUT_VARIABLE DATE + WORKING_DIRECTORY ${CORE_SOURCE_DIR}) + string(SUBSTRING ${DATE} 1 10 DATE) + else() today(DATE) - endif() - string(REPLACE "-" "" DATE ${DATE}) - set(GIT_REV "${DATE}-${HASH}") + set(HASH "nogitfound") endif() + string(REPLACE "-" "" DATE ${DATE}) + set(GIT_REV "${DATE}-${HASH}") if(GIT_REV) set(APP_SCMID ${GIT_REV} PARENT_SCOPE) endif() |