summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarie Houillon <houillonmarie@gmail.com>2022-07-07 16:21:41 +0200
committerGitHub <noreply@github.com>2022-07-07 08:21:41 -0600
commitd393260a1197a6db9b4806f31e5d4784be4a227f (patch)
treefd71d074490410d7df6e03ad5c30081d018bf22a
parent1b919d306fa4d0d95616b5dc91441fc6ba78e958 (diff)
downloadspack-d393260a1197a6db9b4806f31e5d4784be4a227f.tar.gz
spack-d393260a1197a6db9b4806f31e5d4784be4a227f.tar.bz2
spack-d393260a1197a6db9b4806f31e5d4784be4a227f.tar.xz
spack-d393260a1197a6db9b4806f31e5d4784be4a227f.zip
Fix conditional dependencies for openCARP (#31478)
-rw-r--r--var/spack/repos/builtin/packages/meshtool/package.py2
-rw-r--r--var/spack/repos/builtin/packages/opencarp/package.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/meshtool/package.py b/var/spack/repos/builtin/packages/meshtool/package.py
index 33d93b201d..3e4614142d 100644
--- a/var/spack/repos/builtin/packages/meshtool/package.py
+++ b/var/spack/repos/builtin/packages/meshtool/package.py
@@ -14,7 +14,7 @@ class Meshtool(MakefilePackage):
maintainers = ['MarieHouillon']
- version('master', branch='master')
+ version('master', branch='master', preferred=True)
# Version to use with openCARP releases
version('oc10.0', commit='6c5cfbd067120901f15a04bf63beec409bda6dc9')
version('oc9.0', commit='6c5cfbd067120901f15a04bf63beec409bda6dc9')
diff --git a/var/spack/repos/builtin/packages/opencarp/package.py b/var/spack/repos/builtin/packages/opencarp/package.py
index be093c5c13..af71203d8d 100644
--- a/var/spack/repos/builtin/packages/opencarp/package.py
+++ b/var/spack/repos/builtin/packages/opencarp/package.py
@@ -40,8 +40,8 @@ class Opencarp(CMakePackage):
depends_on('zlib')
depends_on('perl')
- depends_on('py-carputils')
- depends_on('meshtool')
+ depends_on('py-carputils', when='+carputils')
+ depends_on('meshtool', when='+meshtool')
# Use specific versions of carputils and meshtool for releases
for ver in ['10.0', '9.0', '8.2', '7.0', '8.1']:
depends_on('py-carputils@oc' + ver, when='@' + ver + ' +carputils')