Use absolute path to LAMMPS_DIR for collecting git info (cbd4ce51) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+10 −7

Original line number	Diff line number	Diff line
		@@ -6,13 +6,16 @@ cmake_minimum_required(VERSION 3.10)

		project(lammps CXX)
		set(SOVERSION 0)
		get_filename_component(LAMMPS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src ABSOLUTE)
		get_filename_component(LAMMPS_LIB_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../lib ABSOLUTE)

		get_filename_component(LAMMPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/.. ABSOLUTE)
		get_filename_component(LAMMPS_LIB_BINARY_DIR ${CMAKE_BINARY_DIR}/lib ABSOLUTE)
		get_filename_component(LAMMPS_DOC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../doc ABSOLUTE)
		get_filename_component(LAMMPS_TOOLS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../tools ABSOLUTE)
		get_filename_component(LAMMPS_PYTHON_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../python ABSOLUTE)
		get_filename_component(LAMMPS_POTENTIALS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../potentials ABSOLUTE)

		set(LAMMPS_SOURCE_DIR ${LAMMPS_DIR}/src)
		set(LAMMPS_LIB_SOURCE_DIR ${LAMMPS_DIR}/lib)
		set(LAMMPS_DOC_DIR ${LAMMPS_DIR}/doc)
		set(LAMMPS_TOOLS_DIR ${LAMMPS_DIR}/tools)
		set(LAMMPS_PYTHON_DIR ${LAMMPS_DIR}/python)
		set(LAMMPS_POTENTIALS_DIR ${LAMMPS_DIR}/potentials)

		find_package(Git)

		@@ -491,7 +494,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${LAMMPS_STYLE_HE
		# Generate lmpgitversion.h
		######################################
		add_custom_target(gitversion COMMAND ${CMAKE_COMMAND}
		-DCMAKE_CURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
		-DLAMMPS_DIR="${LAMMPS_DIR}"
		-DGIT_EXECUTABLE="${GIT_EXECUTABLE}"
		-DGIT_FOUND="${GIT_FOUND}"
		-DLAMMPS_STYLE_HEADERS_DIR="${LAMMPS_STYLE_HEADERS_DIR}"

cmake/Modules/generate_lmpgitversion.cmake

+6 −4

Original line number	Diff line number	Diff line
		@@ -3,17 +3,19 @@ set(temp_git_commit "(unknown)")
		set(temp_git_branch "(unknown)")
		set(temp_git_describe "(unknown)")
		set(temp_git_info "false")
		if(GIT_FOUND AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git)

		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 ${CMAKE_CURRENT_SOURCE_DIR}/.. rev-parse HEAD
		execute_process(COMMAND ${GIT_EXECUTABLE} -C ${LAMMPS_DIR} rev-parse HEAD
		OUTPUT_VARIABLE temp_git_commit
		ERROR_QUIET
		OUTPUT_STRIP_TRAILING_WHITESPACE)
		execute_process(COMMAND ${GIT_EXECUTABLE} -C ${CMAKE_CURRENT_SOURCE_DIR}/.. rev-parse --abbrev-ref HEAD
		execute_process(COMMAND ${GIT_EXECUTABLE} -C ${LAMMPS_DIR} rev-parse --abbrev-ref HEAD
		OUTPUT_VARIABLE temp_git_branch
		ERROR_QUIET
		OUTPUT_STRIP_TRAILING_WHITESPACE)
		execute_process(COMMAND ${GIT_EXECUTABLE} -C ${CMAKE_CURRENT_SOURCE_DIR}/.. describe --dirty=-modified
		execute_process(COMMAND ${GIT_EXECUTABLE} -C ${LAMMPS_DIR} describe --dirty=-modified
		OUTPUT_VARIABLE temp_git_describe
		ERROR_QUIET
		OUTPUT_STRIP_TRAILING_WHITESPACE)

Admin message