diff --git a/CHANGELOG.md b/CHANGELOG.md index dd4571e4279..4c1be6318f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- refactored tableEnd check +- Change minimum CMake version to 3.24 + - This is needed for f2py and meson support +- Refactored tableEnd check - Added commandline options to `checkpoint_benchmark.x` and `restart_benchmark.x` to allow for easier testing of different configurations. Note that the old configuration file style of input is allowed via the `--config_file` option (which overrides any other command line options) - Update ESMF version for Baselibs to match that of Spack for consistency - Update `components.yaml` @@ -28,9 +30,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - GSL 2.8 - jpeg 9f - Various build fixes - - ESMA_cmake v3.52.0 + - ESMA_cmake v3.55.0 - Fixes for using MAPL as a library in spack builds of GEOSgcm - Various backports from v4 + - Code for capturing `mepo status` output + - Fixes for f2py and meson (NOTE: Requires CMake minimum version of 3.24 in project for complete functionality) + - Fixes for `MPI_STACK` code run multiple times - Updates to CI - Use v7.27.0 Baselibs - Use GCC 14 for GNU tests diff --git a/CMakeLists.txt b/CMakeLists.txt index 8dc1502bdf3..2970acee716 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.23) +cmake_minimum_required (VERSION 3.24) get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) if(NOT is_multi_config AND NOT (CMAKE_BUILD_TYPE OR DEFINED ENV{CMAKE_BUILD_TYPE})) diff --git a/components.yaml b/components.yaml index 271f302b4f9..3d65a1df9aa 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ MAPL: ESMA_env: local: ./ESMA_env remote: ../ESMA_env.git - tag: v4.31.0 + tag: v4.32.0 develop: main ESMA_cmake: local: ./ESMA_cmake remote: ../ESMA_cmake.git - tag: v3.52.0 + tag: v3.55.0 develop: develop ecbuild: