summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorThomas-Ulrich <ulrich@geophysik.uni-muenchen.de>2023-05-29 09:59:32 +0200
committerGitHub <noreply@github.com>2023-05-29 09:59:32 +0200
commit0c20760576fb8b811f515afce252a173556af6aa (patch)
treed27a6f8111c1aabf33bba13f87ca0f4da7527865 /var
parent7ee79954935de97c3514a2b297fd7625c32b76d1 (diff)
downloadspack-0c20760576fb8b811f515afce252a173556af6aa.tar.gz
spack-0c20760576fb8b811f515afce252a173556af6aa.tar.bz2
spack-0c20760576fb8b811f515afce252a173556af6aa.tar.xz
spack-0c20760576fb8b811f515afce252a173556af6aa.zip
pumi: fix simmodsuite base variant, and mpi lib name (#37401)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/pumi/package.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/pumi/package.py b/var/spack/repos/builtin/packages/pumi/package.py
index ee88224e21..298041452b 100644
--- a/var/spack/repos/builtin/packages/pumi/package.py
+++ b/var/spack/repos/builtin/packages/pumi/package.py
@@ -95,15 +95,15 @@ class Pumi(CMakePackage):
args += ["-DCMAKE_Fortran_COMPILER=%s" % spec["mpi"].mpifc]
if spec.satisfies("@2.2.3"):
args += ["-DCMAKE_CXX_STANDARD=11"]
- if self.spec.satisfies("simmodsuite=base"):
+ if self.spec.variants["simmodsuite"].value != "none":
args.append("-DENABLE_SIMMETRIX=ON")
- if self.spec.satisfies("simmodsuite=kernels") or self.spec.satisfies("simmodsuite=full"):
- args.append("-DENABLE_SIMMETRIX=ON")
- args.append("-DSIM_PARASOLID=ON")
- args.append("-DSIM_ACIS=ON")
- args.append("-DSIM_DISCRETE=ON")
- mpi_id = spec["mpi"].name + spec["mpi"].version.string
+ mpi_id = spec["mpi"].name + spec["mpi"].version.up_to(1).string
args.append("-DSIM_MPI=" + mpi_id)
+ if self.spec.variants["simmodsuite"].value in ["kernels", "full"]:
+ args.append("-DENABLE_SIMMETRIX=ON")
+ args.append("-DSIM_PARASOLID=ON")
+ args.append("-DSIM_ACIS=ON")
+ args.append("-DSIM_DISCRETE=ON")
return args
def test(self):