From 8e49c0fdecf2879ee679cb904cf45a767a3a76be Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 6 Dec 2024 14:01:33 -0500 Subject: [PATCH 1/2] Update to MAPL 2.51.0, ESMA_cmake 3.55.0 --- CMakeLists.txt | 4 ++-- README.md | 4 ++-- components.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 25d7a70f..a60e9d20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.23) +cmake_minimum_required (VERSION 3.24) cmake_policy (SET CMP0053 NEW) cmake_policy (SET CMP0054 NEW) @@ -80,7 +80,7 @@ if (NOT Baselibs_FOUND) # Another issue with historical reasons, old/wrong zlib target used in GEOS add_library(ZLIB::zlib ALIAS ZLIB::ZLIB) - find_package(MAPL 2.50 QUIET) + find_package(MAPL 2.51 QUIET) if (MAPL_FOUND) message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"") endif () diff --git a/README.md b/README.md index 9ab53c42..16b628b8 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ | [CICE](https://github.com/GEOS-ESM/CICE) | [geos/v0.2.0](https://github.com/GEOS-ESM/CICE/releases/tag/geos%2Fv0.2.0) | | [CPLFCST_Etc](https://github.com/GEOS-ESM/CPLFCST_Etc) | [v1.0.1](https://github.com/GEOS-ESM/CPLFCST_Etc/releases/tag/v1.0.1) | | [ecbuild](https://github.com/GEOS-ESM/ecbuild) | [geos/v1.4.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.4.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.52.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.52.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.55.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.55.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.29.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.29.1) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.12.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.12.0) | @@ -32,7 +32,7 @@ | [GOCART](https://github.com/GEOS-ESM/GOCART) | [sdr_v2.2.1.2](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.2.1.2) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.50.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.50.1) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.51.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.51.0) | | [MITgcm](https://github.com/GEOS-ESM/MITgcm) | [checkpoint68o](https://github.com/GEOS-ESM/MITgcm/releases/tag/checkpoint68o) | | [MOM5](https://github.com/GEOS-ESM/MOM5) | [geos/5.1.0+1.2.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B1.2.0) | | [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.3](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.3) | diff --git a/components.yaml b/components.yaml index 7596fcdd..9345adc0 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v3.52.0 + tag: v3.55.0 develop: develop ecbuild: @@ -44,7 +44,7 @@ GEOS_Util: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.50.1 + tag: v2.51.0 develop: develop FMS: From ff727a8a445a0aa913060ff40608633a9996966b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 10 Dec 2024 09:49:53 -0500 Subject: [PATCH 2/2] Update to MAPL 2.51.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 16b628b8..10aad961 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ | [GOCART](https://github.com/GEOS-ESM/GOCART) | [sdr_v2.2.1.2](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.2.1.2) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.51.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.51.0) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.51.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.51.1) | | [MITgcm](https://github.com/GEOS-ESM/MITgcm) | [checkpoint68o](https://github.com/GEOS-ESM/MITgcm/releases/tag/checkpoint68o) | | [MOM5](https://github.com/GEOS-ESM/MOM5) | [geos/5.1.0+1.2.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B1.2.0) | | [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.3](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.3) | diff --git a/components.yaml b/components.yaml index 9345adc0..42e20c31 100644 --- a/components.yaml +++ b/components.yaml @@ -44,7 +44,7 @@ GEOS_Util: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.51.0 + tag: v2.51.1 develop: develop FMS: