Skip to content

Commit

Permalink
Merge pull request #1189 from GEOS-ESM/hotfix/tclune/#1186-gftl-versi…
Browse files Browse the repository at this point in the history
…on-check

Fixes #1186 - cmake version logic.
  • Loading branch information
mathomp4 authored Nov 9, 2021
2 parents 2971dd7 + 3ebd7fa commit ed3b614
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,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
Expand Down
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit ed3b614

Please sign in to comment.