Commit 04450764 authored by Christoph Junghans's avatar Christoph Junghans
Browse files

include Plumed.h with full path

parent bcc7a4c3

cmake/CMakeLists.txt

+1 −2
Original line number Diff line number Diff line
@@ -541,12 +541,11 @@ if(PKG_USER-PLUMED) 
    set(PLUMED_INSTALL_DIR ${INSTALL_DIR})

    list(APPEND LAMMPS_DEPS plumed_build)

    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()

    find_package(PkgConfig REQUIRED)

    pkg_check_modules(PLUMED plumed REQUIRED)

    list(APPEND LAMMPS_LINK_LIBS ${PLUMED_LDFLAGS})

    set(PLUMED_INCLUDE_DIRS "${PLUMED_INCLUDE_DIRS}/plumed/wrapper")

  endif()

  include_directories(${PLUMED_INCLUDE_DIRS})

endif()

lib/plumed/Install.py

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,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)

src/USER-PLUMED/fix_plumed.cpp

+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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE