diff options
| author | Luca Heltai <luca.heltai@sissa.it> | 2020-05-28 12:02:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 12:02:34 +0200 |
| commit | a6779061d7cbfa6e3bc98dffd3d139bc428014a2 (patch) | |
| tree | fdf8d7b87f4daab8bf5c085cc964e09c3c14db67 | |
| parent | 4351c2eb3264545e2d70e8d78bbc8c1466f80ad9 (diff) | |
| download | spack-a6779061d7cbfa6e3bc98dffd3d139bc428014a2.tar.gz spack-a6779061d7cbfa6e3bc98dffd3d139bc428014a2.tar.bz2 spack-a6779061d7cbfa6e3bc98dffd3d139bc428014a2.tar.xz spack-a6779061d7cbfa6e3bc98dffd3d139bc428014a2.zip | |
dealii: deal with nanoflann after 9.2.0 (#16839)
| -rw-r--r-- | var/spack/repos/builtin/packages/dealii/package.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 9760ac589d..0f46c318f6 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -16,7 +16,7 @@ class Dealii(CMakePackage, CudaPackage): url = "https://github.com/dealii/dealii/releases/download/v8.4.1/dealii-8.4.1.tar.gz" git = "https://github.com/dealii/dealii.git" - maintainers = ['davydden', 'jppelteret'] + maintainers = ['davydden', 'jppelteret', 'luca-heltai'] # Don't add RPATHs to this package for the full build DAG. # only add for immediate deps. @@ -140,7 +140,8 @@ class Dealii(CMakePackage, CudaPackage): depends_on('metis@5:+int64', when='+metis+int64') depends_on('metis@5:~int64', when='+metis~int64') depends_on('muparser', when='+muparser') - depends_on('nanoflann', when='@9.0:+nanoflann') + # Nanoflann support has been removed after 9.2.0 + depends_on('nanoflann', when='@9.0:9.2+nanoflann') depends_on('netcdf-c+mpi', when='+netcdf+mpi') depends_on('netcdf-cxx', when='+netcdf+mpi') depends_on('oce', when='+oce') @@ -211,6 +212,10 @@ class Dealii(CMakePackage, CudaPackage): 'onwards. Please explicitly disable this variant ' 'via ~{0}'.format(p)) + conflicts('+nanoflann', when='@9.3.0:', + msg='The interface to nanoflann was removed from version 9.3.0. ' + 'Please explicitly disable this variant via ~nanoflann') + conflicts('+slepc', when='~petsc', msg='It is not possible to enable slepc interfaces ' 'without petsc.') |