From 73321dd3ea81f18ec5430f45916fa8007e83daf7 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 18 Mar 2020 12:09:28 -0600 Subject: CGNS: Version update (#15523) * CGNS: Version update The CGNS library has several new versions. There was a format-changing change in 3.4.0 which was removed for 3.4.1. The change was then added again and released with a change to the major version (4.0.0). Note that 4.0.0 should be close to the functionality of 3.4.0. * CGNS: Add shared variant Added the `shared`variant to make the CMake build correctly pick up the RPATH settings. --- var/spack/repos/builtin/packages/cgns/package.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/cgns/package.py b/var/spack/repos/builtin/packages/cgns/package.py index 4e8a112634..a4f6aa0582 100644 --- a/var/spack/repos/builtin/packages/cgns/package.py +++ b/var/spack/repos/builtin/packages/cgns/package.py @@ -18,6 +18,10 @@ class Cgns(CMakePackage): version('develop', branch='develop') version('master', branch='master') + version('4.1.1', sha256='055d345c3569df3ae832fb2611cd7e0bc61d56da41b2be1533407e949581e226') + version('4.1.0', sha256='4674de1fac3c47998248725fd670377be497f568312c5903d1bb8090a3cf4da0') + version('4.0.0', sha256='748585a8e52dff4d250d6b603e6b847d05498e4566aba2dc3d7a7d85c4d55849') + version('3.4.1', sha256='d32595e7737b9332243bd3de1eb8c018a272f620f09b289dea8292eba1365994') version('3.4.0', sha256='6372196caf25b27d38cf6f056258cb0bdd45757f49d9c59372b6dbbddb1e05da') version('3.3.1', sha256='81093693b2e21a99c5640b82b267a495625b663d7b8125d5f1e9e7aaa1f8d469') version('3.3.0', sha256='8422c67994f8dc6a2f201523a14f6c7d7e16313bdd404c460c16079dbeafc662') @@ -27,6 +31,7 @@ class Cgns(CMakePackage): variant('scoping', default=True, description='Enable scoping') variant('mpi', default=True, description='Enable parallel cgns') variant('int64', default=False, description='Build with 64-bit integers') + variant('shared', default=True, description='Enable shared library') depends_on('hdf5~mpi', when='+hdf5~mpi') depends_on('hdf5+mpi', when='+hdf5+mpi') @@ -44,7 +49,9 @@ class Cgns(CMakePackage): '-DCGNS_ENABLE_PARALLEL:BOOL=%s' % ( 'ON' if '+mpi' in spec else 'OFF'), '-DCGNS_ENABLE_TESTS:BOOL=OFF', - '-DCGNS_BUILD_CGNSTOOLS:BOOL=OFF' + '-DCGNS_BUILD_CGNSTOOLS:BOOL=OFF', + '-DCGNS_BUILD_SHARED:BOOL=%s' % ( + 'ON' if '+shared' in spec else 'OFF') ]) if '+mpi' in spec: -- cgit v1.2.3-60-g2f50