zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adios2: use f-strings (#40437)

Browse Source
This commit is contained in:
Alec Scott 2023-10-11 20:08:00 -07:00 committed by GitHub
parent d9cb1a1070
commit deec1b7c2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
var/spack/repos/builtin/packages/adios2/package.py
View File

@ -109,19 +109,19 @@ class Adios2(CMakePackage, CudaPackage):
depends_on("cmake@3.12.0:", type="build") depends_on("cmake@3.12.0:", type="build")
for _platform in ["linux", "darwin", "cray"]: for _platform in ["linux", "darwin", "cray"]:
depends_on("pkgconfig", type="build", when="platform=%s" % _platform) depends_on("pkgconfig", type="build", when=f"platform={_platform}")
variant( variant(
"pic", "pic",
default=False, default=False,
description="Build pic-enabled static libraries", description="Build pic-enabled static libraries",
when="platform=%s" % _platform, when=f"platform={_platform}",
) )
# libffi and libfabric and not currently supported on Windows # libffi and libfabric and not currently supported on Windows
# see Paraview's superbuild handling of libfabric at # see Paraview's superbuild handling of libfabric at
# https://gitlab.kitware.com/paraview/paraview-superbuild/-/blob/master/projects/adios2.cmake#L3 # https://gitlab.kitware.com/paraview/paraview-superbuild/-/blob/master/projects/adios2.cmake#L3
depends_on("libffi", when="+sst platform=%s" % _platform) # optional in DILL depends_on("libffi", when=f"+sst platform={_platform}") # optional in DILL
depends_on( depends_on(
"libfabric@1.6.0:", when="+sst platform=%s" % _platform "libfabric@1.6.0:", when=f"+sst platform={_platform}"
) # optional in EVPath and SST ) # optional in EVPath and SST
# depends_on('bison', when='+sst') # optional in FFS, broken package # depends_on('bison', when='+sst') # optional in FFS, broken package
# depends_on('flex', when='+sst') # optional in FFS, depends on BISON # depends_on('flex', when='+sst') # optional in FFS, depends on BISON
@ -241,8 +241,8 @@ def cmake_args(self):
args.extend(["-DCMAKE_Fortran_SUBMODULE_EXT=.smod", "-DCMAKE_Fortran_SUBMODULE_SEP=."]) args.extend(["-DCMAKE_Fortran_SUBMODULE_EXT=.smod", "-DCMAKE_Fortran_SUBMODULE_SEP=."])
if "+python" in spec or self.run_tests: if "+python" in spec or self.run_tests:
args.append("-DPYTHON_EXECUTABLE:FILEPATH=%s" % spec["python"].command.path) args.append(f"-DPYTHON_EXECUTABLE:FILEPATH={spec['python'].command.path}")
args.append("-DPython_EXECUTABLE:FILEPATH=%s" % spec["python"].command.path) args.append(f"-DPython_EXECUTABLE:FILEPATH={spec['python'].command.path}")
return args return args