From 4dc9989631fbd4ea854d7231d8a7c17f658756ce Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Wed, 2 Aug 2023 19:03:46 -0400
Subject: [PATCH 1/2] Update FindESMF.cmake file to match ESMF 8.5.0

---
 CHANGELOG.md         | 6 ++++++
 CMakeLists.txt       | 2 +-
 cmake/FindESMF.cmake | 8 ++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc9bdd1a8b83..2127e393ec35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.40.3] - 2023-08-03
+
+### Fixed
+
+- Updated `FindESMF.cmake` file to match that of ESMF v8.5.0
+
 ## [2.40.2] - 2023-08-01
 
 ### Fixed
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 825bba06abca..b37803868b14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ endif ()
 
 project (
   MAPL
-  VERSION 2.40.2
+  VERSION 2.40.3
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 # Set the possible values of build type for cmake-gui
diff --git a/cmake/FindESMF.cmake b/cmake/FindESMF.cmake
index 161654428d88..23efbb31d078 100644
--- a/cmake/FindESMF.cmake
+++ b/cmake/FindESMF.cmake
@@ -96,13 +96,17 @@ if(EXISTS ${ESMFMKFILE})
       message(WARNING "Static ESMF library (libesmf.a) not found in \
                        ${ESMF_LIBSDIR}. Try setting USE_ESMF_STATIC_LIBS=OFF")
     endif()
-    add_library(ESMF STATIC IMPORTED)
+    if(NOT TARGET ESMF)
+      add_library(ESMF STATIC IMPORTED)
+    endif()
   else()
     find_library(ESMF_LIBRARY_LOCATION NAMES esmf PATHS ${ESMF_LIBSDIR} NO_DEFAULT_PATH)
     if(ESMF_LIBRARY_LOCATION MATCHES "ESMF_LIBRARY_LOCATION-NOTFOUND")
       message(WARNING "ESMF library not found in ${ESMF_LIBSDIR}.")
     endif()
-    add_library(ESMF UNKNOWN IMPORTED)
+    if(NOT TARGET ESMF)
+      add_library(ESMF UNKNOWN IMPORTED)
+    endif()
   endif()
 
   # Add ESMF include directories

From ca62617138769fce8b1aba3b9995abd321e4ab85 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Thu, 3 Aug 2023 14:49:51 -0400
Subject: [PATCH 2/2] Fix up changelog

---
 CHANGELOG.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b2146ed9fa8..a68810e478e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,21 +11,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Update `components.yaml`
-  - ESMA_cmake v3.31.1 (Fixes for NAG)
-
 ### Fixed
 
-- Undoing previous workaround for NAG + `MAPL_Config.F90` in v2.40.1 which was a workaround was not portable to Linux. Instead, this uses changes in ESMA_cmake v3.31.1 for flags with NAG.
-
 ### Removed
 
 ### Deprecated
 
 ## [2.40.3] - 2023-08-03
 
+### Changed
+
+- Update `components.yaml`
+  - ESMA_cmake v3.31.1 (Fixes for NAG)
+
 ### Fixed
 
+- Undoing previous workaround for NAG + `MAPL_Config.F90` in v2.40.1 which was a workaround was not portable to Linux. Instead, this uses changes in ESMA_cmake v3.31.1 for flags with NAG.
 - Updated `FindESMF.cmake` file to match that of ESMF v8.5.0
 
 ## [2.40.2] - 2023-08-01