diff options
| author | Seth R. Johnson <johnsonsr@ornl.gov> | 2022-01-21 08:11:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-21 13:11:12 +0000 |
| commit | 9ac207c901c46d005a8cce1460fa110192af6cb5 (patch) | |
| tree | 9b0b4df108daa0c8022d076160bc22381139ac2b /var | |
| parent | bd43467cbfb2c5f2961019b42609811a8b06bb56 (diff) | |
| download | spack-9ac207c901c46d005a8cce1460fa110192af6cb5.tar.gz spack-9ac207c901c46d005a8cce1460fa110192af6cb5.tar.bz2 spack-9ac207c901c46d005a8cce1460fa110192af6cb5.tar.xz spack-9ac207c901c46d005a8cce1460fa110192af6cb5.zip | |
vecgeom/veccore: fix version interdependency (#28164)
* vecgeom: require exact version of veccore
Fixes configure error from downstream package:
```
CMake Error at /rnsdhpc/code/spack/opt/spack/apple-clang/cmake/7zgbrwt/share/cmake-3.22/Modules/CMakeFindDependencyMacro.cmake:47 (find_package):
Could not find a configuration file for package "VecCore" that is
compatible with requested version "0.8.0".
The following configuration files were considered but not accepted:
/rnsdhpc/code/spack/var/spack/environments/celeritas/.spack-env/view/lib/cmake/VecCore/VecCoreConfig.cmake, version: 0.6.0
```
* veccore: add new versions
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/veccore/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/vecgeom/package.py | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/veccore/package.py b/var/spack/repos/builtin/packages/veccore/package.py index 3c2c2913ac..c414472d33 100644 --- a/var/spack/repos/builtin/packages/veccore/package.py +++ b/var/spack/repos/builtin/packages/veccore/package.py @@ -16,6 +16,10 @@ class Veccore(CMakePackage, CudaPackage): maintainers = ['drbenmorgan', 'sethrj'] version('master', branch='master') + # Note: 0.8.0 tag is currently unofficial but it is needed explicitly for + # VecGeom 1.1.18 + version('0.8.0', commit='6038e4732394413b0661fede171c77e75ed9bd71') + version('0.7.0', sha256='8aa97e19c455382f1a3dae07ffa5e49f2982f09e75b25a3f98d7b94cd43d6001') version('0.6.0', sha256='e7ff874ba2a8201624795cbe11c84634863e4ac7da691a936772d4202ef54413') version('0.5.2', sha256='0cfaa830b9d10fb9df4ced5208a742623da08520fea5949461fe81637a27db15') version('0.5.1', sha256='5ef3a8d8692d8f82641aae76b58405b8b3a1539a8f21b23d66a5df8327eeafc4') diff --git a/var/spack/repos/builtin/packages/vecgeom/package.py b/var/spack/repos/builtin/packages/vecgeom/package.py index fdace11f12..8432b4ca90 100644 --- a/var/spack/repos/builtin/packages/vecgeom/package.py +++ b/var/spack/repos/builtin/packages/vecgeom/package.py @@ -50,6 +50,7 @@ class Vecgeom(CMakePackage, CudaPackage): variant('shared', default=True, description='Build shared libraries') + depends_on('veccore@0.8.0', type=('build', 'link'), when='@1.1.18') depends_on('veccore@0.5.2:', type=('build', 'link'), when='@1.1.0:') depends_on('veccore@0.4.2', type=('build', 'link'), when='@:1.0') depends_on('veccore+cuda', type=('build', 'link'), when='+cuda') |