diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/fds/package.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/fds/package.py b/var/spack/repos/builtin/packages/fds/package.py index e4707f9207..3143eddde0 100644 --- a/var/spack/repos/builtin/packages/fds/package.py +++ b/var/spack/repos/builtin/packages/fds/package.py @@ -21,8 +21,14 @@ class Fds(MakefilePackage): url = "https://github.com/firemodels/fds/archive/refs/tags/FDS-6.8.0.tar.gz" git = "https://github.com/firemodels/fds.git" + version("6.9.1", commit="889da6ae08d08dae680f7c0d8de66a3ad1c65375") + version("6.9.0", commit="63395692607884566fdedb5db4b5b4d98d3bcafb") version("6.8.0", commit="886e0096535519b7358a3c4393c91da3caee5072") + variant("openmp", default=False, description="Enable OpenMP support") + + conflicts("%gcc", when="+openmp", msg="GCC already provides OpenMP support") + depends_on("fortran", type="build") # generated depends_on("mpi") @@ -86,11 +92,12 @@ class Fds(MakefilePackage): mpi_prefix = mpi_mapping[spec["mpi"].name] compiler_prefix = compiler_mapping[spec.compiler.name] platform_prefix = platform_mapping[spec.architecture.platform] - return ["{}_{}_{}".format(mpi_prefix, compiler_prefix, platform_prefix)] + openmp_prefix = "_openmp" if "+openmp" in spec else "" + return [f"{mpi_prefix}_{compiler_prefix}_{platform_prefix}{openmp_prefix}"] def install(self, spec, prefix): mkdirp(prefix.bin) with working_dir(self.build_directory): install("*.mod", prefix.bin) install("*.o", prefix.bin) - install("fds_" + self.build_targets[0], prefix.bin + "/fds") + install("fds_" + self.build_targets[0], join_path(prefix.bin, "fds")) |