Merge pull request #2051 from akohlmey/collected-small-changes (48262fd0) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+7 −2

Original line number	Diff line number	Diff line
		@@ -425,7 +425,12 @@ if(PKG_USER-ATC)
		if(LAMMPS_SIZES STREQUAL BIGBIG)
		message(FATAL_ERROR "The USER-ATC Package is not compatible with -DLAMMPS_BIGBIG")
		endif()
		target_link_libraries(atc PRIVATE ${LAPACK_LIBRARIES} MPI::MPI_CXX)
		target_link_libraries(atc PRIVATE ${LAPACK_LIBRARIES})
		if(BUILD_MPI)
		target_link_libraries(atc PRIVATE MPI::MPI_CXX)
		else()
		target_link_libraries(atc PRIVATE mpi_stubs)
		endif()
		target_include_directories(atc PRIVATE ${LAMMPS_SOURCE_DIR})
		target_compile_definitions(atc PRIVATE -DLAMMPS_${LAMMPS_SIZES})
		endif()
		@@ -548,7 +553,7 @@ if(BUILD_TOOLS)
		install(TARGETS binary2txt DESTINATION ${CMAKE_INSTALL_BINDIR})

		include(CheckGeneratorSupport)
		if(CMAKE_GENERATOR_SUPPORT_FORTRAN)
		if(CMAKE_GENERATOR_SUPPORT_FORTRAN AND CMAKE_Fortran_COMPILER)
		enable_language(Fortran)
		add_executable(chain.x ${LAMMPS_TOOLS_DIR}/chain.f)
		target_link_libraries(chain.x PRIVATE ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})

+5 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,11 @@ if(DOWNLOAD_VORO)
		ExternalProject_Add(voro_build
		URL https://download.lammps.org/thirdparty/voro++-0.4.6.tar.gz
		URL_MD5 2338b824c3b7b25590e18e8df5d68af9
		CONFIGURE_COMMAND "" BUILD_COMMAND make ${VORO_BUILD_OPTIONS} BUILD_IN_SOURCE 1 INSTALL_COMMAND ""
		PATCH_COMMAND patch -b -p0 < ${LAMMPS_LIB_SOURCE_DIR}/voronoi/voro-make.patch
		CONFIGURE_COMMAND ""
		BUILD_COMMAND make ${VORO_BUILD_OPTIONS}
		BUILD_IN_SOURCE 1
		INSTALL_COMMAND ""
		BUILD_BYPRODUCTS <SOURCE_DIR>/src/libvoro++.a
		)
		ExternalProject_get_property(voro_build SOURCE_DIR)

+3 −3

Original line number	Diff line number	Diff line
		@@ -5,10 +5,10 @@
		set(ALL_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL
		DIPOLE GRANULAR KSPACE MANYBODY MC MISC MOLECULE OPT PERI
		POEMS PYTHON QEQ REPLICA RIGID SHOCK SNAP SPIN SRD VORONOI
		USER-CGDNA USER-CGSDK USER-COLVARS USER-DIFFRACTION
		USER-DPD USER-DRUDE USER-FEP USER-MEAMC USER-MESODPD
		USER-BOCS USER-CGDNA USER-CGSDK USER-COLVARS USER-DIFFRACTION
		USER-DPD USER-DRUDE USER-EFF USER-FEP USER-MEAMC USER-MESODPD
		USER-MISC USER-MOFFF USER-OMP USER-PHONON USER-REACTION
		USER-REAXC USER-SPH USER-SMD USER-UEF USER-YAFF)
		USER-REAXC USER-SDPD USER-SPH USER-SMD USER-UEF USER-YAFF)

		foreach(PKG ${ALL_PACKAGES})
		set(PKG_${PKG} ON CACHE BOOL "" FORCE)

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ Syntax
		v_name = global value calculated by an equal-style variable with name

		* zero or more keyword/arg pairs may be appended
		* keyword = type or start or file or overwrite or title1 or title2 or ncorr or p or m
		* keyword = type or start or file or overwrite or title1 or title2 or ncorr or nlen or ncount

		.. parsed-literal::

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ the :doc:`run <run>` command.

		Restrictions
		""""""""""""
		The diskfree attribute is currently only supported on Linux and MacOS.
		The diskfree attribute is currently only supported on Linux, MacOSX, and BSD.

		Related commands
		""""""""""""""""