Add language depends_on on several packages (#45298)
This commit is contained in:
		| @@ -28,8 +28,6 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage): | |||||||
|     version("2.1.0", tag="v2.1.0", commit="533df139c267e2a93c268dfe68f9aec55de11cf0") |     version("2.1.0", tag="v2.1.0", commit="533df139c267e2a93c268dfe68f9aec55de11cf0") | ||||||
|     version("2.0.0", tag="v2.0.0", commit="5ceebadf75d1c98999ea9e9446926722d061ec22") |     version("2.0.0", tag="v2.0.0", commit="5ceebadf75d1c98999ea9e9446926722d061ec22") | ||||||
| 
 | 
 | ||||||
|     depends_on("cxx", type="build")  # generated |  | ||||||
| 
 |  | ||||||
|     variant( |     variant( | ||||||
|         "backend", |         "backend", | ||||||
|         default="mpi", |         default="mpi", | ||||||
| @@ -52,6 +50,9 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage): | |||||||
|     variant("kokkos", default=False, description="Enable Kokkos Support") |     variant("kokkos", default=False, description="Enable Kokkos Support") | ||||||
|     variant("openmp", default=False, description="Enable OpenMP Support") |     variant("openmp", default=False, description="Enable OpenMP Support") | ||||||
| 
 | 
 | ||||||
|  |     depends_on("c", type="build") | ||||||
|  |     depends_on("cxx", type="build") | ||||||
|  | 
 | ||||||
|     # All Current FleCSI Releases |     # All Current FleCSI Releases | ||||||
|     for level in ("low", "medium", "high"): |     for level in ("low", "medium", "high"): | ||||||
|         depends_on("caliper@:2.5,2.8:", when=f"caliper_detail={level}") |         depends_on("caliper@:2.5,2.8:", when=f"caliper_detail={level}") | ||||||
|   | |||||||
| @@ -43,9 +43,7 @@ class LammpsExamplePlugin(CMakePackage): | |||||||
|         preferred=True, |         preferred=True, | ||||||
|     ) |     ) | ||||||
| 
 | 
 | ||||||
|     depends_on("c", type="build")  # generated |     depends_on("cxx", type="build") | ||||||
|     depends_on("cxx", type="build")  # generated |  | ||||||
|     depends_on("fortran", type="build")  # generated |  | ||||||
| 
 | 
 | ||||||
|     def url_for_version(self, version): |     def url_for_version(self, version): | ||||||
|         split_ver = str(version).split(".") |         split_ver = str(version).split(".") | ||||||
|   | |||||||
| @@ -369,9 +369,15 @@ class Lammps(CMakePackage, CudaPackage, ROCmPackage, PythonExtension): | |||||||
|         deprecated=True, |         deprecated=True, | ||||||
|     ) |     ) | ||||||
| 
 | 
 | ||||||
|     depends_on("c", type="build")  # generated |     depends_on("cxx", type="build") | ||||||
|     depends_on("cxx", type="build")  # generated | 
 | ||||||
|     depends_on("fortran", type="build")  # generated |     # mdi, scafacos, ml-quip, qmmm require C, but not available in Spack | ||||||
|  |     for c_pkg in ("adios", "atc", "awpmd", "ml-pod", "electrode", "kim", "h5md", "tools"): | ||||||
|  |         depends_on("c", type="build", when=f"+{c_pkg}") | ||||||
|  | 
 | ||||||
|  |     # scafacos, ml-quip require Fortran, but not available in Spack | ||||||
|  |     for fc_pkg in ("kim",): | ||||||
|  |         depends_on("fortran", type="build", when=f"+{fc_pkg}") | ||||||
| 
 | 
 | ||||||
|     stable_versions = { |     stable_versions = { | ||||||
|         "20230802.3", |         "20230802.3", | ||||||
| @@ -602,6 +608,7 @@ def url_for_version(self, version): | |||||||
|         values=("double", "mixed", "single"), |         values=("double", "mixed", "single"), | ||||||
|         multi=False, |         multi=False, | ||||||
|     ) |     ) | ||||||
|  |     variant("tools", default=False, description="Build LAMMPS tools (msi2lmp, binary2txt, chain)") | ||||||
| 
 | 
 | ||||||
|     depends_on("cmake@3.16:", when="@20231121:") |     depends_on("cmake@3.16:", when="@20231121:") | ||||||
|     depends_on("mpi", when="+mpi") |     depends_on("mpi", when="+mpi") | ||||||
| @@ -780,6 +787,7 @@ def cmake_args(self): | |||||||
|             self.define_from_variant("LAMMPS_EXCEPTIONS", "exceptions"), |             self.define_from_variant("LAMMPS_EXCEPTIONS", "exceptions"), | ||||||
|             self.define_from_variant("{}_MPI".format(mpi_prefix), "mpi"), |             self.define_from_variant("{}_MPI".format(mpi_prefix), "mpi"), | ||||||
|             self.define_from_variant("BUILD_OMP", "openmp"), |             self.define_from_variant("BUILD_OMP", "openmp"), | ||||||
|  |             self.define_from_variant("BUILD_TOOLS", "tools"), | ||||||
|             self.define("ENABLE_TESTING", self.run_tests), |             self.define("ENABLE_TESTING", self.run_tests), | ||||||
|             self.define("DOWNLOAD_POTENTIALS", False), |             self.define("DOWNLOAD_POTENTIALS", False), | ||||||
|         ] |         ] | ||||||
|   | |||||||
| @@ -34,7 +34,8 @@ class PortsOfCall(CMakePackage): | |||||||
|         deprecated=True, |         deprecated=True, | ||||||
|     ) |     ) | ||||||
| 
 | 
 | ||||||
|     depends_on("cxx", type="build")  # generated |     depends_on("c", type="build")  # todo: disable cmake default? | ||||||
|  |     depends_on("cxx", type="build") | ||||||
| 
 | 
 | ||||||
|     variant( |     variant( | ||||||
|         "portability_strategy", |         "portability_strategy", | ||||||
|   | |||||||
| @@ -34,9 +34,6 @@ class SingularityEos(CMakePackage, CudaPackage): | |||||||
|         deprecated=True, |         deprecated=True, | ||||||
|     ) |     ) | ||||||
| 
 | 
 | ||||||
|     depends_on("cxx", type="build")  # generated |  | ||||||
|     depends_on("fortran", type="build")  # generated |  | ||||||
| 
 |  | ||||||
|     # build with kokkos, kokkos-kernels for offloading support |     # build with kokkos, kokkos-kernels for offloading support | ||||||
|     variant("kokkos", default=False, description="Enable kokkos") |     variant("kokkos", default=False, description="Enable kokkos") | ||||||
|     variant( |     variant( | ||||||
| @@ -69,6 +66,10 @@ class SingularityEos(CMakePackage, CudaPackage): | |||||||
| 
 | 
 | ||||||
|     variant("closure", default=True, description="Build closure module") |     variant("closure", default=True, description="Build closure module") | ||||||
| 
 | 
 | ||||||
|  |     depends_on("c", type="build") | ||||||
|  |     depends_on("cxx", type="build") | ||||||
|  |     depends_on("fortran", type="build", when="+fortran") | ||||||
|  | 
 | ||||||
|     # building/testing/docs |     # building/testing/docs | ||||||
|     depends_on("cmake@3.19:", type="build") |     depends_on("cmake@3.19:", type="build") | ||||||
|     depends_on("python@3:", when="+python") |     depends_on("python@3:", when="+python") | ||||||
|   | |||||||
| @@ -38,7 +38,8 @@ class Spiner(CMakePackage, CudaPackage): | |||||||
|         deprecated=True, |         deprecated=True, | ||||||
|     ) |     ) | ||||||
| 
 | 
 | ||||||
|     depends_on("cxx", type="build")  # generated |     depends_on("c", type="build")  # todo: disable cmake default? | ||||||
|  |     depends_on("cxx", type="build") | ||||||
| 
 | 
 | ||||||
|     # When overriding/overloading varaints, the last variant is always used, except for |     # When overriding/overloading varaints, the last variant is always used, except for | ||||||
|     # "when" clauses. Therefore, call the whens FIRST then the non-whens. |     # "when" clauses. Therefore, call the whens FIRST then the non-whens. | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Richard Berger
					Richard Berger