From f7d9cf813f3bf43d06950f2fb52d749edc46e80c Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Mon, 26 Oct 2020 17:21:52 -0400 Subject: [PATCH] Enable gathering of git info with git v1.8.3.1 The -C flag wasn't supported back then. The workaround is to change the working directory via CMake. This issue was detected while building on CentOS 7. --- cmake/Modules/generate_lmpgitversion.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/generate_lmpgitversion.cmake b/cmake/Modules/generate_lmpgitversion.cmake index afd4447867..4ff01c7501 100644 --- a/cmake/Modules/generate_lmpgitversion.cmake +++ b/cmake/Modules/generate_lmpgitversion.cmake @@ -7,17 +7,20 @@ set(temp_git_info "false") message(STATUS "Git Directory: ${LAMMPS_DIR}/.git") if(GIT_FOUND AND EXISTS ${LAMMPS_DIR}/.git) set(temp_git_info "true") - execute_process(COMMAND ${GIT_EXECUTABLE} -C ${LAMMPS_DIR} rev-parse HEAD + execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD OUTPUT_VARIABLE temp_git_commit ERROR_QUIET + WORKING_DIRECTORY ${LAMMPS_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process(COMMAND ${GIT_EXECUTABLE} -C ${LAMMPS_DIR} rev-parse --abbrev-ref HEAD + execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD OUTPUT_VARIABLE temp_git_branch ERROR_QUIET + WORKING_DIRECTORY ${LAMMPS_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process(COMMAND ${GIT_EXECUTABLE} -C ${LAMMPS_DIR} describe --dirty=-modified + execute_process(COMMAND ${GIT_EXECUTABLE} describe --dirty=-modified OUTPUT_VARIABLE temp_git_describe ERROR_QUIET + WORKING_DIRECTORY ${LAMMPS_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE) endif()