temp commit in current state

2 files changed, 10 insertions, 3 deletions

diff --git a/var/spack/repos/builtin/packages/intelmpi/package.py b/var/spack/repos/builtin/packages/intelmpi/package.py
index 16cfbab260..7fec2a5832 100644
--- a/var/spack/repos/builtin/packages/intelmpi/package.py
+++ b/var/spack/repos/builtin/packages/intelmpi/package.py
@@ -11,6 +11,12 @@ class Intelmpi(Package):
     # Provides a virtual dependency 'mpi'
     provides('mpi')
 
+    def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
+        spack_env.set('MPICC',  join_path(self.prefix.bin, 'mpicc'))
+        spack_env.set('MPICXX', join_path(self.prefix.bin, 'mpic++'))
+        spack_env.set('MPIF77', join_path(self.prefix.bin, 'mpif77'))
+        spack_env.set('MPIF90', join_path(self.prefix.bin, 'mpif90'))
+
 #    def install(self, spec, prefix):
 #        configure("--prefix=%s" % prefix)
 #        make()
diff --git a/var/spack/repos/builtin/packages/plumed/package.py b/var/spack/repos/builtin/packages/plumed/package.py
index b179076b7f..58b3ba17c4 100644
--- a/var/spack/repos/builtin/packages/plumed/package.py
+++ b/var/spack/repos/builtin/packages/plumed/package.py
@@ -52,9 +52,10 @@ class Plumed(Package):
     version('2.2.3', git="https://github.com/plumed/plumed2.git", tag='v2.2.3')
 
     # FIXME: Add additional dependencies if required.
-    depends_on('intelmpi')
+    depends_on('mpi')
 
     def install(self, spec, prefix):
-        # FIXME: Unknown build system
+        configure("--prefix=" + prefix,
+                  "--enable-mpi",
+                  "-enable-modules=crystallization")
         make()
-        make('install')