From bcc7a4c32fc1fd29d855d68cda84eed7f9e3c095 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Mon, 29 Oct 2018 06:36:47 -0600
Subject: [PATCH 1/2] cmake: add PLUMED include dir

---
 cmake/CMakeLists.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index ebcd34f966..d46567b277 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -538,14 +538,17 @@ 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/plumed/wrapper")
   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()
 
 if(PKG_USER-MOLFILE)

From 044507640f6fa0ff044f3192a1f1efe5a0688471 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Mon, 29 Oct 2018 06:52:19 -0600
Subject: [PATCH 2/2] include Plumed.h with full path

---
 cmake/CMakeLists.txt           | 3 +--
 lib/plumed/Install.py          | 2 +-
 src/USER-PLUMED/fix_plumed.cpp | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index d46567b277..89eb9df257 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -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()
diff --git a/lib/plumed/Install.py b/lib/plumed/Install.py
index 6613add4f3..fc8fa509c1 100644
--- a/lib/plumed/Install.py
+++ b/lib/plumed/Install.py
@@ -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)
diff --git a/src/USER-PLUMED/fix_plumed.cpp b/src/USER-PLUMED/fix_plumed.cpp
index d43c39bf8d..f0582b184a 100644
--- a/src/USER-PLUMED/fix_plumed.cpp
+++ b/src/USER-PLUMED/fix_plumed.cpp
@@ -37,7 +37,7 @@
 */
 #define __PLUMED_WRAPPER_FORTRAN 1
 
-#include "Plumed.h"
+#include "plumed/wrapper/Plumed.h"
 
 using namespace LAMMPS_NS;
 using namespace FixConst;