diff options
| author | Wouter Deconinck <wdconinc@gmail.com> | 2021-07-20 09:51:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-20 16:51:05 +0200 |
| commit | c1567463b095074d9bc685f04281c8101082fcd9 (patch) | |
| tree | 5f0b860e9439fedc1dc0739fa06b3cf0dcccba29 | |
| parent | 889ece85ed4d9305a5b47863ee9579d67ff6a1b2 (diff) | |
| download | spack-c1567463b095074d9bc685f04281c8101082fcd9.tar.gz spack-c1567463b095074d9bc685f04281c8101082fcd9.tar.bz2 spack-c1567463b095074d9bc685f04281c8101082fcd9.tar.xz spack-c1567463b095074d9bc685f04281c8101082fcd9.zip | |
kassiopeia: new versions, updated cmake_args (#24964)
Co-authored-by: Massimiliano Culpo <massimiliano.culpo@gmail.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/kassiopeia/package.py | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/var/spack/repos/builtin/packages/kassiopeia/package.py b/var/spack/repos/builtin/packages/kassiopeia/package.py index 20656a951e..8050a2092a 100644 --- a/var/spack/repos/builtin/packages/kassiopeia/package.py +++ b/var/spack/repos/builtin/packages/kassiopeia/package.py @@ -17,6 +17,9 @@ class Kassiopeia(CMakePackage): maintainers = ['wdconinc'] + version("main", branch="main") + version('3.7.7', sha256='b5f62b2e796fac57698794b46b63acbc47ce02010bd1f716996918a550b22a21') + version('3.7.6', sha256='fa20cf0f29ee2312bf96b07661d7b5c9303782d907671acd01032cc1f13edd55') version('3.7.5', sha256='8f28d08c7ef51e64221e0a4705f3cee3a5d738b8cdde5ce9fa58a3a0dd14ae05') version('3.7.4', sha256='c1514163a084530930be10dbe487fb1950ccbc9662a4a190bdecffbd84a71fd4') version('3.7.3', sha256='a8753585b9fa0903e1f5f821c4ced3cddd72792ad7e6075a7e25318f81ad9eaa') @@ -47,21 +50,15 @@ class Kassiopeia(CMakePackage): depends_on('opencl', when='+opencl') def cmake_args(self): - args = [] - if self.spec.satisfies('+vtk'): - args.append('-DKASPER_USE_VTK=ON') + if '+root' in self.spec: + cxxstd = self.spec['root'].variants['cxxstd'].value else: - args.append('-DKASPER_USE_VTK=OFF') - if self.spec.satisfies('+tbb'): - args.append('-DKASPER_USE_TBB=ON') - else: - args.append('-DKASPER_USE_TBB=OFF') - if self.spec.satisfies('+mpi'): - args.append('-DKEMField_USE_MPI=ON') - else: - args.append('-DKEMField_USE_MPI=OFF') - if self.spec.satisfies('+opencl'): - args.append('-DKEMField_USE_OPENCL=ON') - else: - args.append('-DKEMField_USE_OPENCL=OFF') + cxxstd = '14' + args = [ + self.define_from_variant("KASPER_USE_VTK", "vtk"), + self.define_from_variant("KASPER_USE_TBB", "tbb"), + self.define_from_variant("KEMField_USE_MPI", "mpi"), + self.define_from_variant("KEMField_USE_OPENCL", "opencl"), + self.define("CMAKE_CXX_STANDARD", cxxstd) + ] return args |