From 6005813518e41a890e9b7c93bf7190c4181d3c5e Mon Sep 17 00:00:00 2001 From: Rocco Meli Date: Mon, 16 Dec 2024 09:24:21 +0100 Subject: [PATCH] CP2K: use ninja generator and add constraint on dla-future-fortran (#48033) * cp2k ninja * version --- var/spack/repos/builtin/packages/cp2k/package.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index 5a478ea9850..4bd3ef4c435 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -57,9 +57,11 @@ class Cp2k(MakefilePackage, CMakePackage, CudaPackage, ROCmPackage): version("7.1", sha256="ccd711a09a426145440e666310dd01cc5772ab103493c4ae6a3470898cd0addb") version("master", branch="master", submodules="True") - depends_on("c", type="build") # generated - depends_on("cxx", type="build") # generated - depends_on("fortran", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") + depends_on("fortran", type="build") + + generator("ninja") variant("mpi", default=True, description="Enable MPI support") variant("openmp", default=True, description="Enable OpenMP support") @@ -240,6 +242,7 @@ class Cp2k(MakefilePackage, CMakePackage, CudaPackage, ROCmPackage): with when("@2024.2:"): depends_on("dla-future-fortran@0.1.0:") + depends_on("dla-future-fortran@0.2.0:", when="@2025.1:") # Use a direct dependency on dla-future so that constraints can be expressed # WARN: In the concretizer output, dla-future will appear as dependency of CP2K