summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Davydov <davydden@gmail.com>2018-05-11 14:22:12 +0200
committerMassimiliano Culpo <massimiliano.culpo@gmail.com>2018-05-11 14:22:12 +0200
commit206e61bafdde19b6ec28583386e08917aefb91b0 (patch)
treecdf454304e8bf35cece949b4d38db0100281933c
parent55473dd32162c3506e4bd8881ae3b0424f2f0d5b (diff)
downloadspack-206e61bafdde19b6ec28583386e08917aefb91b0.tar.gz
spack-206e61bafdde19b6ec28583386e08917aefb91b0.tar.bz2
spack-206e61bafdde19b6ec28583386e08917aefb91b0.tar.xz
spack-206e61bafdde19b6ec28583386e08917aefb91b0.zip
gmsh: add netgen and tetgen (#8060)
* gmsh: add netgen and tetgen dealii: require gmsh+netgen+tetgen netgen: use http instead of https * dealii: add oce requirement to gmsh
-rw-r--r--var/spack/repos/builtin/packages/dealii/package.py2
-rw-r--r--var/spack/repos/builtin/packages/gmsh/package.py45
-rw-r--r--var/spack/repos/builtin/packages/netgen/package.py2
3 files changed, 31 insertions, 18 deletions
diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py
index 2e8db4f505..f6b8ba449e 100644
--- a/var/spack/repos/builtin/packages/dealii/package.py
+++ b/var/spack/repos/builtin/packages/dealii/package.py
@@ -120,7 +120,7 @@ class Dealii(CMakePackage, CudaPackage):
depends_on('assimp', when='@9.0:+assimp')
depends_on('doxygen+graphviz', when='+doc')
depends_on('graphviz', when='+doc')
- depends_on('gmsh', when='@9.0:+gmsh', type=('build', 'run'))
+ depends_on('gmsh+tetgen+netgen+oce', when='@9.0:+gmsh', type=('build', 'run'))
depends_on('gsl', when='@8.5.0:+gsl')
depends_on('hdf5+mpi+hl', when='+hdf5+mpi')
depends_on('cuda@8:', when='+cuda')
diff --git a/var/spack/repos/builtin/packages/gmsh/package.py b/var/spack/repos/builtin/packages/gmsh/package.py
index f798bd1e7f..ece75c4bde 100644
--- a/var/spack/repos/builtin/packages/gmsh/package.py
+++ b/var/spack/repos/builtin/packages/gmsh/package.py
@@ -45,19 +45,16 @@ class Gmsh(CMakePackage):
version('2.12.0', '7fbd2ec8071e79725266e72744d21e902d4fe6fa9e7c52340ad5f4be5c159d09')
version('2.11.0', 'f15b6e7ac9ca649c9a74440e1259d0db')
- variant('shared', default=True,
- description='Enables the build of shared libraries')
- variant('mpi', default=True,
- description='Builds MPI support for parser and solver')
- variant('fltk', default=False,
- description='Enables the build of the FLTK GUI')
+ variant('shared', default=True, description='Enables the build of shared libraries')
+ variant('mpi', default=True, description='Builds MPI support for parser and solver')
+ variant('fltk', default=False, description='Enables the build of the FLTK GUI')
variant('hdf5', default=False, description='Enables HDF5 support')
- variant('compression', default=True,
- description='Enables IO compression through zlib')
+ variant('compression', default=True, description='Enables IO compression through zlib')
+ variant('netgen', default=False, description='Build with Netgen')
variant('oce', default=False, description='Build with OCE')
variant('petsc', default=False, description='Build with PETSc')
- variant('slepc', default=False,
- description='Build with SLEPc (only when PETSc is enabled)')
+ variant('slepc', default=False, description='Build with SLEPc (only when PETSc is enabled)')
+ variant('tetgen', default=False, description='Build with Tetgen')
depends_on('blas')
depends_on('lapack')
@@ -67,12 +64,16 @@ class Gmsh(CMakePackage):
# Assumes OpenGL with GLU is already provided by the system:
depends_on('fltk', when='+fltk')
depends_on('hdf5', when='+hdf5')
+ depends_on('netgen', when='+netgen')
depends_on('oce', when='+oce')
depends_on('petsc+mpi', when='+petsc+mpi')
depends_on('petsc', when='+petsc~mpi')
depends_on('slepc', when='+slepc+petsc')
+ depends_on('tetgen', when='+tetgen')
depends_on('zlib', when='+compression')
+ conflicts('+slepc', when='~petsc')
+
def cmake_args(self):
spec = self.spec
prefix = self.prefix
@@ -103,21 +104,33 @@ class Gmsh(CMakePackage):
if '+oce' in spec:
env['CASROOT'] = self.spec['oce'].prefix
- options.extend(['-DENABLE_OCC=ON'])
+ options.append('-DENABLE_OCC=ON')
else:
- options.extend(['-DENABLE_OCC=OFF'])
+ options.append('-DENABLE_OCC=OFF')
if '+petsc' in spec:
env['PETSC_DIR'] = self.spec['petsc'].prefix
- options.extend(['-DENABLE_PETSC=ON'])
+ options.append('-DENABLE_PETSC=ON')
+ else:
+ options.append('-DENABLE_PETSC=OFF')
+
+ if '+tetgen' in spec:
+ env['TETGEN_DIR'] = self.spec['tetgen'].prefix
+ options.append('-DENABLE_TETGEN=ON')
+ else:
+ options.append('-DENABLE_TETGEN=OFF')
+
+ if '+netgen' in spec:
+ env['NETGEN_DIR'] = self.spec['netgen'].prefix
+ options.append('-DENABLE_NETGEN=ON')
else:
- options.extend(['-DENABLE_PETSC=OFF'])
+ options.append('-DENABLE_NETGEN=OFF')
if '+slepc' in spec:
env['SLEPC_DIR'] = self.spec['slepc'].prefix
- options.extend(['-DENABLE_SLEPC=ON'])
+ options.append('-DENABLE_SLEPC=ON')
else:
- options.extend(['-DENABLE_SLEPC=OFF'])
+ options.append('-DENABLE_SLEPC=OFF')
if '+shared' in spec:
# Builds dynamic executable and installs shared library
diff --git a/var/spack/repos/builtin/packages/netgen/package.py b/var/spack/repos/builtin/packages/netgen/package.py
index ef9d448b6e..6273d5ae18 100644
--- a/var/spack/repos/builtin/packages/netgen/package.py
+++ b/var/spack/repos/builtin/packages/netgen/package.py
@@ -48,7 +48,7 @@ class Netgen(AutotoolsPackage):
depends_on('metis', when='+metis')
def url_for_version(self, version):
- url = "https://gigenet.dl.sourceforge.net/project/netgen-mesher/netgen-mesher/{0}/netgen-{1}.tar.gz"
+ url = "http://gigenet.dl.sourceforge.net/project/netgen-mesher/netgen-mesher/{0}/netgen-{1}.tar.gz"
return url.format(version.up_to(2), version)
def configure_args(self):