Merge branch 'master' of github.com:gtribello/lammps into fix-plumed (42068944) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+4 −2

Original line number	Diff line number	Diff line
		@@ -538,14 +538,16 @@ if(PKG_USER-PLUMED)
		CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR>
		$<$<BOOL:${BUILD_SHARED_LIBS}>:--with-pic> )
		ExternalProject_get_property(plumed_build INSTALL_DIR)
		set(PLUMED_BUILD_DIR ${INSTALL_DIR})
		set(PLUMED_INSTALL_DIR ${INSTALL_DIR})
		list(APPEND LAMMPS_DEPS plumed_build)
		list(APPEND LAMMPS_LINK_LIBS ${PLUMED_BUILD_DIR}/lib/libplumed.so)
		list(APPEND LAMMPS_LINK_LIBS ${PLUMED_INSTALL_DIR}/lib/libplumed.so)
		set(PLUMED_INCLUDE_DIRS "${PLUMED_INSTALL_DIR}/include")
		else()
		find_package(PkgConfig REQUIRED)
		pkg_check_modules(PLUMED plumed REQUIRED)
		list(APPEND LAMMPS_LINK_LIBS ${PLUMED_LDFLAGS})
		endif()
		include_directories(${PLUMED_INCLUDE_DIRS})
		endif()

		if(PKG_USER-MOLFILE)

+1 −1

Original line number	Diff line number	Diff line
		@@ -184,7 +184,7 @@ if linkflag:
		os.remove("includelink")
		if os.path.isfile("liblink") or os.path.islink("liblink"):
		os.remove("liblink")
		cmd = 'ln -s "%s/plumed2/include/plumed/wrapper" includelink' % homepath
		cmd = 'ln -s "%s/plumed2/include" includelink' % homepath
		subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
		cmd = 'ln -s "%s/plumed2/lib" liblink' % homepath
		subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@
		*/
		#define __PLUMED_WRAPPER_FORTRAN 1

		#include "Plumed.h"
		#include "plumed/wrapper/Plumed.h"

		using namespace LAMMPS_NS;
		using namespace FixConst;