From f27fefc3c1fc26f1c6aad1d1a125a522078ba779 Mon Sep 17 00:00:00 2001 From: Robert Pavel Date: Thu, 8 Apr 2021 08:36:41 -0600 Subject: Exodusii: added versions up to v2021-04-05 (#22819) Fixed previously unspecified python dependency and ensured that spack's python is what exodus@v2016 uses. Also, in the process, identified many missing versions --- var/spack/repos/builtin/packages/exodusii/package.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/var/spack/repos/builtin/packages/exodusii/package.py b/var/spack/repos/builtin/packages/exodusii/package.py index b2f1d6db59..435a084d13 100644 --- a/var/spack/repos/builtin/packages/exodusii/package.py +++ b/var/spack/repos/builtin/packages/exodusii/package.py @@ -20,7 +20,18 @@ class Exodusii(CMakePackage): homepage = "https://github.com/gsjaardema/seacas" git = "https://github.com/gsjaardema/seacas.git" + url = "https://github.com/gsjaardema/seacas/archive/refs/tags/v2021-04-05.zip" + version('2021-04-05', sha256='f40d318674753287b8b28d2b4e5cca872cd772d4c7383af4a8f3eeb48fcc7ec0') + version('2021-04-02', sha256='811037a68eaff0daf9f34bd31b2ab1c9b8f028dfcb998ab01fbcb80d9458257c') + version('2021-01-20', sha256='6ff7c3f0651138f2e2305b5270108ca45f96346a739b35a126a0a260c91cbe64') + version('2021-01-06', sha256='69cafef17d8e624c2d9871f3a281ff3690116a6f82162fe5c1507bb4ecd6a32a') + version('2020-08-13', sha256='5b128a8ad9b0a69cff4fe937828d6d1702f1fe8aa80d4751e6522939afe62957') + version('2020-05-12', sha256='0402facf6cf23d903d878fb924b5d57e9f279dead5b92cf986953a6b91a6e81f') + version('2020-03-16', sha256='ed1d42c8c657931ecd45367a465cf9c00255772d9cd0811fc9baacdb67fc71fa') + version('2020-01-16', sha256='db69dca25595e88a40c00db0ccf2afed1ecd6008ba30bb478a4e1c5dd61998b8') + version('2019-12-18', sha256='88a71de836aa26fd63756cf3ffbf3978612edc5b6c61fa8de32fe9d638007774') + version('2019-10-14', sha256='f143d90e8a7516d25979d1416e580dea638332db723f26ae94a712dfe4052e8f') version('2016-08-09', commit='2ffeb1b') version('master', branch='master') @@ -33,6 +44,8 @@ class Exodusii(CMakePackage): depends_on('netcdf-c@4.6.1:+mpi', when='+mpi') depends_on('netcdf-c@4.6.1:~mpi', when='~mpi') + depends_on('python@2.7:') + def cmake_args(self): spec = self.spec @@ -56,5 +69,12 @@ class Exodusii(CMakePackage): '-DCMAKE_C_COMPILER={0}'.format(cc_path), '-DCMAKE_CXX_COMPILER={0}'.format(cxx_path), ] + # Python # + # Handle v2016 separately because of older tribits + if spec.satisfies('@:2016-08-09'): + options.append('-DPYTHON_EXECUTABLE={0}'.format( + join_path(self.spec['python'].prefix.bin, 'python'))) + else: + options.append('-DPython_ROOT={0}'.format(spec['python'].prefix)) return options -- cgit v1.2.3-60-g2f50