ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:gtribello/lammps into fix-plumed

Browse Source
This commit is contained in:
Axel Kohlmeyer
2018-10-30 20:43:49 -04:00
parent e3b89b60dc 044507640f
commit 42068944aa
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/CMakeLists.txt
View File

@ -538,14 +538,16 @@ if(PKG_USER-PLUMED)
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR>
$<$<BOOL:${BUILD_SHARED_LIBS}>:--with-pic> ) $<$<BOOL:${BUILD_SHARED_LIBS}>:--with-pic> )
ExternalProject_get_property(plumed_build INSTALL_DIR) 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_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() else()
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(PLUMED plumed REQUIRED) pkg_check_modules(PLUMED plumed REQUIRED)
list(APPEND LAMMPS_LINK_LIBS ${PLUMED_LDFLAGS}) list(APPEND LAMMPS_LINK_LIBS ${PLUMED_LDFLAGS})
endif() endif()
include_directories(${PLUMED_INCLUDE_DIRS})
endif() endif()
if(PKG_USER-MOLFILE) if(PKG_USER-MOLFILE)

2
lib/plumed/Install.py
View File

@ -184,7 +184,7 @@ if linkflag:
os.remove("includelink") os.remove("includelink")
if os.path.isfile("liblink") or os.path.islink("liblink"): if os.path.isfile("liblink") or os.path.islink("liblink"):
os.remove("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) subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
cmd = 'ln -s "%s/plumed2/lib" liblink' % homepath cmd = 'ln -s "%s/plumed2/lib" liblink' % homepath
subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True) subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)

2
src/USER-PLUMED/fix_plumed.cpp
View File

@ -37,7 +37,7 @@
*/ */
#define __PLUMED_WRAPPER_FORTRAN 1 #define __PLUMED_WRAPPER_FORTRAN 1
#include "Plumed.h" #include "plumed/wrapper/Plumed.h"
using namespace LAMMPS_NS; using namespace LAMMPS_NS;
using namespace FixConst; using namespace FixConst;