hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dealii: deal with nanoflann after 9.2.0 (#16839)

Browse source
This commit is contained in:
Luca Heltai 2020-05-28 12:02:34 +02:00 committed by GitHub
parent 4351c2eb32
commit a6779061d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
var/spack/repos/builtin/packages/dealii/package.py
View file

@ -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.')