zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dealii: minor fixes (#5687)

Browse Source 
* dealii: fix minor bug in Assimp config

* dealii: request sundials without pthreads
This commit is contained in:
Denis Davydov 2017-10-11 23:09:39 +02:00 committed by Christoph Junghans
parent cfc13dec9f
commit 35a62f715b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/dealii/package.py
View File

@ -146,7 +146,7 @@ class Dealii(CMakePackage):
depends_on("slepc", when='+slepc+petsc+mpi') depends_on("slepc", when='+slepc+petsc+mpi')
depends_on("slepc@:3.6.3", when='@:8.4.1+slepc+petsc+mpi') depends_on("slepc@:3.6.3", when='@:8.4.1+slepc+petsc+mpi')
depends_on("slepc~arpack", when='+slepc+petsc+mpi+int64') depends_on("slepc~arpack", when='+slepc+petsc+mpi+int64')
depends_on("sundials", when='@9.0:+sundials') depends_on("sundials~pthread", when='@9.0:+sundials')
depends_on("trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado+teuchos", when='+trilinos+mpi~int64') depends_on("trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado+teuchos", when='+trilinos+mpi~int64')
depends_on("trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado+teuchos~hypre", when="+trilinos+mpi+int64") depends_on("trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado+teuchos~hypre", when="+trilinos+mpi+int64")
@ -293,12 +293,12 @@ def cmake_args(self):
# Assimp # Assimp
if '+assimp' in spec: if '+assimp' in spec:
options.extend([ options.extend([
'-DEAL_II_WITH_ASSIMP=ON', '-DDEAL_II_WITH_ASSIMP=ON',
'-DASSIMP_DIR=%s' % spec['assimp'].prefix '-DASSIMP_DIR=%s' % spec['assimp'].prefix
]) ])
else: else:
options.extend([ options.extend([
'-DEAL_II_WITH_ASSIMP=OFF' '-DDEAL_II_WITH_ASSIMP=OFF'
]) ])
# since Netcdf is spread among two, need to do it by hand: # since Netcdf is spread among two, need to do it by hand: