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

include Plumed.h with full path

Browse Source
This commit is contained in:
Christoph Junghans
2018-10-29 06:52:19 -06:00
parent bcc7a4c32f
commit 044507640f
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/CMakeLists.txt
View File

@ -541,12 +541,11 @@ if(PKG_USER-PLUMED)
set(PLUMED_INSTALL_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_INSTALL_DIR}/lib/libplumed.so) list(APPEND LAMMPS_LINK_LIBS ${PLUMED_INSTALL_DIR}/lib/libplumed.so)
set(PLUMED_INCLUDE_DIRS "${PLUMED_INSTALL_DIR}/include/plumed/wrapper") 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})
set(PLUMED_INCLUDE_DIRS "${PLUMED_INCLUDE_DIRS}/plumed/wrapper")
endif() endif()
include_directories(${PLUMED_INCLUDE_DIRS}) include_directories(${PLUMED_INCLUDE_DIRS})
endif() endif()

2
lib/plumed/Install.py
View File

@ -163,7 +163,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;