summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorKelly (KT) Thompson <KineticTheory@users.noreply.github.com>2017-09-20 18:21:14 -0600
committerChristoph Junghans <christoph.junghans@gmail.com>2017-09-20 18:21:14 -0600
commitd10aa385fb1f5cf056b204476a0978c8a318688e (patch)
tree959a8d95b984b4ee4712735ad470f7aebd4cbc7f /var
parent02b7e38bb2446c5f0fe4c4a1d6026c116fb8f862 (diff)
downloadspack-d10aa385fb1f5cf056b204476a0978c8a318688e.tar.gz
spack-d10aa385fb1f5cf056b204476a0978c8a318688e.tar.bz2
spack-d10aa385fb1f5cf056b204476a0978c8a318688e.tar.xz
spack-d10aa385fb1f5cf056b204476a0978c8a318688e.zip
Update recipe for cgns to avoid build warnings/errors: (#5382)
+ The recipe for cgns seems to be wrong. CMake complains about variables set but not used (`HDF5_NEEDS_ZLIB`, `HDF5_NEEDS_MPI` and `HDF5_NEEDS_SZIP`) and fails to find HDF5. + This change set removes these variables from the cmake configure line, replacing them with `'-DHDF5_DIR=%s' % spec['hdf5'].prefix` + cgns also has trouble with parallel make, so I set `parallel = False`.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/cgns/package.py13
1 files changed, 3 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/cgns/package.py b/var/spack/repos/builtin/packages/cgns/package.py
index eed884df39..624ffab7f3 100644
--- a/var/spack/repos/builtin/packages/cgns/package.py
+++ b/var/spack/repos/builtin/packages/cgns/package.py
@@ -40,6 +40,8 @@ class Cgns(CMakePackage):
depends_on('cmake@2.8:', type='build')
depends_on('hdf5', when='+hdf5')
+ parallel = False
+
def cmake_args(self):
spec = self.spec
cmake_args = []
@@ -52,18 +54,9 @@ class Cgns(CMakePackage):
if '+hdf5' in spec:
cmake_args.extend([
'-DCGNS_ENABLE_HDF5=ON',
- '-DHDF5_NEEDS_ZLIB=ON'
+ '-DHDF5_DIR=%s' % spec['hdf5'].prefix
])
- if spec.satisfies('^hdf5+mpi'):
- cmake_args.append('-DHDF5_NEEDS_MPI=ON')
- else:
- cmake_args.append('-DHDF5_NEEDS_MPI=OFF')
-
- if spec.satisfies('^hdf5+szip'):
- cmake_args.append('-DHDF5_NEEDS_SZIP=ON')
- else:
- cmake_args.append('-DHDF5_NEEDS_SZIP=OFF')
else:
cmake_args.append('-DCGNS_ENABLE_HDF5=OFF')