Merge branch 'master' into bond/react-reset_mol_ids (c9773fc2) · Commits · 郑智淋 / lammps

.gitattributes

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		.gitattributes export-ignore
		.gitignore export-ignore
		.github export-ignore

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		comment: false
		coverage:
		notify:
		slack:
		default:
		url: "secret:HWZbvgtc6OD7F3v3PfrK3/rzCJvScbh69Fi1CkLwuHK0+wIBIHVR+Q5i7q6F9Ln4OChbiRGtYAEUUsT8/jmBu4qDpIi8mx746codc0z/Z3aafLd24pBrCEPLvdCfIZxqPnw3TuUgGhwmMDZf0+thg8YNUr/MbOZ7Li2L6+ZbYuA="
		threshold: 10%
		only_pulls: false
		branches:
		- "master"
		flags:
		- "unit"
		paths:
		- "src"
		status:
		project:
		default:
		branches:
		- "master"
		paths:
		- "src"
		informational: true
		patch:
		default:
		branches:
		- "master"
		paths:
		- "src"
		informational: true

+7 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ endif()
		# we require C++11 without extensions
		set(CMAKE_CXX_STANDARD 11)
		set(CMAKE_CXX_STANDARD_REQUIRED ON)
		set(CMAKE_CXX_EXTENSIONS OFF)
		set(CMAKE_CXX_EXTENSIONS OFF CACHE BOOL "Use compiler extensions")

		########################################################################
		# User input options #
		@@ -747,6 +747,12 @@ if (${_index} GREATER -1)
		endif()
		message(STATUS "<<< Linker flags: >>>")
		message(STATUS "Executable name: ${LAMMPS_BINARY}")
		if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13)
		get_target_property(OPTIONS lammps LINK_OPTIONS)
		if(OPTIONS)
		message(STATUS "Linker options: ${OPTIONS}")
		endif()
		endif()
		if(CMAKE_EXE_LINKER_FLAGS)
		message(STATUS "Executable linker flags: ${CMAKE_EXE_LINKER_FLAGS}")
		endif()

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,8 +29,8 @@ if(BUILD_DOC)
		OUTPUT requirements.txt
		DEPENDS docenv
		COMMAND ${CMAKE_COMMAND} -E copy ${LAMMPS_DOC_DIR}/utils/requirements.txt requirements.txt
		COMMAND ${DOCENV_BINARY_DIR}/pip install -r requirements.txt --upgrade
		COMMAND ${DOCENV_BINARY_DIR}/pip install --upgrade ${LAMMPS_DOC_DIR}/utils/converters
		COMMAND ${DOCENV_BINARY_DIR}/pip install --use-feature=2020-resolver -r requirements.txt --upgrade
		)

		# download mathjax distribution and unpack to folder "mathjax"

+4 −4

Original line number	Diff line number	Diff line
		@@ -52,26 +52,26 @@ add_library(GTest::GTest UNKNOWN IMPORTED)
		set_target_properties(GTest::GTest PROPERTIES
		IMPORTED_LOCATION ${GTEST_LIBRARY_PATH}
		INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIR}
		IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
		INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
		add_dependencies(GTest::GTest googletest)

		add_library(GTest::GMock UNKNOWN IMPORTED)
		set_target_properties(GTest::GMock PROPERTIES
		IMPORTED_LOCATION ${GMOCK_LIBRARY_PATH}
		INTERFACE_INCLUDE_DIRECTORIES ${GMOCK_INCLUDE_DIR}
		IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
		INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
		add_dependencies(GTest::GMock googletest)

		add_library(GTest::GTestMain UNKNOWN IMPORTED)
		set_target_properties(GTest::GTestMain PROPERTIES
		IMPORTED_LOCATION ${GTEST_MAIN_LIBRARY_PATH}
		INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIR}
		IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
		INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
		add_dependencies(GTest::GTestMain googletest)

		add_library(GTest::GMockMain UNKNOWN IMPORTED)
		set_target_properties(GTest::GMockMain PROPERTIES
		IMPORTED_LOCATION ${GMOCK_MAIN_LIBRARY_PATH}
		INTERFACE_INCLUDE_DIRECTORIES ${GMOCK_INCLUDE_DIR}
		IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
		INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
		add_dependencies(GTest::GMockMain googletest)