From 0c20760576fb8b811f515afce252a173556af6aa Mon Sep 17 00:00:00 2001 From: Thomas-Ulrich Date: Mon, 29 May 2023 09:59:32 +0200 Subject: pumi: fix simmodsuite base variant, and mpi lib name (#37401) --- var/spack/repos/builtin/packages/pumi/package.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'var') 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): -- cgit v1.2.3-70-g09d2