From d6be4638265ba27a6d910979acdfe5c322698f36 Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Mon, 8 Nov 2021 17:07:40 -0500 Subject: [PATCH 1/3] Fixes #1186 - cmake version logic. --- CHANGELOG.md | 2 ++ CMakeLists.txt | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0633ff5fb4f8..2fb8b932f4c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- Fragile CMake logic for checking minimum version requirements for gFTL. + ### Added ### Changed diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a86a1e5f76d..d484f4417a35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,6 +73,10 @@ message (STATUS "Building MAPL as ${MAPL_LIBRARY_TYPE} libraries") if(NOT TARGET GFTL::gftl) # MAPL currently requires at least GFTL 1.5.1 find_package(GFTL 1.5.1 REQUIRED) +else() + if (GFTL_VERSION VERSION_LESS 1.5.1) + message(FATAL_ERROR "GFTL must be at least 1.5.1 - check baselibs version.") + endif () endif() if(NOT TARGET GFTL_SHARED::gftl-shared) find_package(GFTL_SHARED REQUIRED) From af19f3fbbaf798b5ae64543d7de2747548fef357 Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Mon, 8 Nov 2021 17:12:11 -0500 Subject: [PATCH 2/3] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d484f4417a35..279054c33a7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW) project ( MAPL - VERSION 2.12.0 + VERSION 2.12.1 LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF # Set the default build type to release From 3ebd7fa1afd22138cba0427927e51e9cadae2c27 Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Mon, 8 Nov 2021 17:18:29 -0500 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fb8b932f4c4..c5b0994d722e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,8 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed -- Fragile CMake logic for checking minimum version requirements for gFTL. - ### Added ### Changed @@ -19,6 +17,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Deprecated +## [2.12.1] - 2021-11-08 + +### Fixed + +- Fixes #1186. Fragile CMake logic for checking minimum version requirements for gFTL. + ## [2.12.0] - 2021-11-03 ### Fixed