pfunit: fix @4: ~openmp (#33024)

This commit is contained in:
Charles Ferenbaugh 2022-10-05 17:03:18 -06:00 committed by GitHub
parent 5b45ffb353
commit 21ca17a157
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -80,7 +80,6 @@ def cmake_args(self):
self.define_from_variant("BUILD_SHARED", "shared"), self.define_from_variant("BUILD_SHARED", "shared"),
"-DCMAKE_Fortran_MODULE_DIRECTORY=%s" % spec.prefix.include, "-DCMAKE_Fortran_MODULE_DIRECTORY=%s" % spec.prefix.include,
self.define_from_variant("BUILD_DOCS", "docs"), self.define_from_variant("BUILD_DOCS", "docs"),
self.define_from_variant("OPENMP", "openmp"),
"-DMAX_RANK=%s" % spec.variants["max_array_rank"].value, "-DMAX_RANK=%s" % spec.variants["max_array_rank"].value,
] ]
@ -89,8 +88,10 @@ def cmake_args(self):
if spec.satisfies("@4.0.0:"): if spec.satisfies("@4.0.0:"):
args.append("-DSKIP_MPI=%s" % ("YES" if "~mpi" in spec else "NO")) args.append("-DSKIP_MPI=%s" % ("YES" if "~mpi" in spec else "NO"))
args.append("-DSKIP_OPENMP=%s" % ("YES" if "~openmp" in spec else "NO"))
else: else:
args.append(self.define_from_variant("MPI", "mpi")) args.append(self.define_from_variant("MPI", "mpi"))
args.append(self.define_from_variant("OPENMP", "openmp"))
if spec.satisfies("+mpi"): if spec.satisfies("+mpi"):
args.extend( args.extend(