From d30621e78751a74b414b41623ef3a01139373e00 Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Tue, 5 Mar 2024 03:57:13 -0800 Subject: dakota: make python dependency optional, add v6.19 (#42914) Co-authored-by: Massimiliano Culpo --- var/spack/repos/builtin/packages/dakota/package.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/dakota/package.py b/var/spack/repos/builtin/packages/dakota/package.py index 2b8372a45d..a466641268 100644 --- a/var/spack/repos/builtin/packages/dakota/package.py +++ b/var/spack/repos/builtin/packages/dakota/package.py @@ -42,6 +42,12 @@ class Dakota(CMakePackage): license("LGPL-2.1-or-later") + version( + "6.19.0", + tag="v6.19.0", + commit="603f448b916a8f629d258922e26e7e40dcaaf8ce", + submodules=submodules, + ) version( "6.18", tag="v6.18.0", @@ -54,6 +60,7 @@ class Dakota(CMakePackage): variant("shared", default=True, description="Enables the build of shared libraries") variant("mpi", default=True, description="Activates MPI support") + variant("python", default=True, description="Add Python dependency for dakota.interfacing API") # Generic 'lapack' provider won't work, dakota searches for # 'LAPACKConfig.cmake' or 'lapack-config.cmake' on the path @@ -62,7 +69,7 @@ class Dakota(CMakePackage): depends_on("blas") depends_on("mpi", when="+mpi") - depends_on("python") + depends_on("python", when="+python") depends_on("perl-data-dumper", type="build", when="@6.12:") depends_on("boost@:1.68.0", when="@:6.12") depends_on("boost@1.69.0:", when="@6.18:") @@ -78,7 +85,10 @@ class Dakota(CMakePackage): def cmake_args(self): spec = self.spec - args = [self.define_from_variant("BUILD_SHARED_LIBS", "shared")] + args = [ + self.define_from_variant("BUILD_SHARED_LIBS", "shared"), + self.define_from_variant("DAKOTA_PYTHON", "python"), + ] if "+mpi" in spec: args.extend( -- cgit v1.2.3-70-g09d2