Merge pull request #1565 from adamjstewart/features/fftw

Add latest version of fftw

2 files changed, 18 insertions, 10 deletions

diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py
index 570cd1bbdd..3069e39226 100644
--- a/var/spack/repos/builtin/packages/fftw/package.py
+++ b/var/spack/repos/builtin/packages/fftw/package.py
@@ -22,8 +22,6 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
-
-
 from spack import *
 
 
@@ -33,12 +31,12 @@ class Fftw(Package):
        size, and of both real and complex data (as well as of even/odd
        data, i.e. the discrete cosine/sine transforms or DCT/DST). We
        believe that FFTW, which is free software, should become the FFT
-       library of choice for most applications.
+       library of choice for most applications."""
 
-    """
     homepage = "http://www.fftw.org"
     url      = "http://www.fftw.org/fftw-3.3.4.tar.gz"
 
+    version('3.3.5', '6cc08a3b9c7ee06fdd5b9eb02e06f569')
     version('3.3.4', '2edab8c06b24feeb3b82bbb3ebf3e7b3')
 
     variant(
@@ -60,10 +58,13 @@ class Fftw(Package):
     # targets are supported
 
     def install(self, spec, prefix):
-        options = ['--prefix=%s' % prefix,
-                   '--enable-shared',
-                   '--enable-threads']
-    # Add support for OpenMP
+        options = [
+            '--prefix={0}'.format(prefix),
+            '--enable-shared',
+            '--enable-threads'
+        ]
+
+        # Add support for OpenMP
         if '+openmp' in spec:
             # Note: Apple's Clang does not support OpenMP.
             if spec.satisfies('%clang'):
@@ -78,17 +79,25 @@ class Fftw(Package):
 
         configure(*options)
         make()
+        if self.run_tests:
+            make("check")
         make("install")
 
         if '+float' in spec:
             configure('--enable-float', *options)
             make()
+            if self.run_tests:
+                make("check")
             make("install")
         if '+long_double' in spec:
             configure('--enable-long-double', *options)
             make()
+            if self.run_tests:
+                make("check")
             make("install")
         if '+quad' in spec:
             configure('--enable-quad-precision', *options)
             make()
+            if self.run_tests:
+                make("check")
             make("install")
diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py
index d39c9738ef..8611dc2026 100644
--- a/var/spack/repos/builtin/packages/gromacs/package.py
+++ b/var/spack/repos/builtin/packages/gromacs/package.py
@@ -22,7 +22,6 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
-
 from spack import *
 
 
@@ -57,7 +56,7 @@ class Gromacs(Package):
     depends_on('plumed+mpi', when='+plumed+mpi')
     depends_on('plumed~mpi', when='+plumed~mpi')
     depends_on('fftw')
-    depends_on('cmake', type='build')
+    depends_on('cmake@2.8.8:', type='build')
 
     # TODO : add GPU support