From 06581adfa1f6f0ade3395583bb67aaaf7ee4a823 Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Wed, 1 Mar 2023 22:10:41 +0100
Subject: [PATCH] Add cmake spec

Constrain to CMake >=3.23.0 as required by Trilinos.
---
 conda/bootstrap.py | 4 ++++
 conda/default.cfg  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/conda/bootstrap.py b/conda/bootstrap.py
index 5656a6521e..b038866dfe 100755
--- a/conda/bootstrap.py
+++ b/conda/bootstrap.py
@@ -386,6 +386,7 @@ def build_spack_env(config, update_spack, machine, compiler, mpi, spack_env,
                     spack_base, spack_template_path, env_vars, tmpdir, logger):
 
     albany = config.get('deploy', 'albany')
+    cmake = config.get('deploy', 'cmake')
     esmf = config.get('deploy', 'esmf')
     lapack = config.get('deploy', 'lapack')
     petsc = config.get('deploy', 'petsc')
@@ -395,6 +396,9 @@ def build_spack_env(config, update_spack, machine, compiler, mpi, spack_env,
 
     specs = list()
 
+    if cmake != 'None':
+        specs.append(f'cmake@{cmake}')
+
     e3sm_hdf5_netcdf = config.getboolean('deploy', 'use_e3sm_hdf5_netcdf')
     if not e3sm_hdf5_netcdf:
         hdf5 = config.get('deploy', 'hdf5')
diff --git a/conda/default.cfg b/conda/default.cfg
index a5cde0183a..b8cf19a440 100644
--- a/conda/default.cfg
+++ b/conda/default.cfg
@@ -21,6 +21,8 @@ mpi = nompi
 
 # the version of various packages to include if using spack
 albany = develop
+# cmake newer than 3.23.0 needed for Trilinos
+cmake = 3.23.0:
 esmf = 8.2.0
 hdf5 = 1.12.1
 lapack = 3.9.1