From 35a62f715be12a701c18abeb784200a7f766ebeb Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 11 Oct 2017 23:09:39 +0200 Subject: dealii: minor fixes (#5687) * dealii: fix minor bug in Assimp config * dealii: request sundials without pthreads --- var/spack/repos/builtin/packages/dealii/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 8d07965928..be359a5c31 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -146,7 +146,7 @@ class Dealii(CMakePackage): depends_on("slepc", when='+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("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~hypre", when="+trilinos+mpi+int64") @@ -293,12 +293,12 @@ class Dealii(CMakePackage): # Assimp if '+assimp' in spec: options.extend([ - '-DEAL_II_WITH_ASSIMP=ON', + '-DDEAL_II_WITH_ASSIMP=ON', '-DASSIMP_DIR=%s' % spec['assimp'].prefix ]) else: options.extend([ - '-DEAL_II_WITH_ASSIMP=OFF' + '-DDEAL_II_WITH_ASSIMP=OFF' ]) # since Netcdf is spread among two, need to do it by hand: -- cgit v1.2.3-70-g09d2