From 0f64478789c652c4b45d5f787ca5505d6e418f7c Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Wed, 30 Aug 2023 15:04:26 -0400
Subject: [PATCH 1/3] Fix MAPL dependencies for MAPL-as-library in CMake

---
 CHANGELOG.md               |  6 ++++++
 cmake/mapl-import.cmake.in |  3 ---
 mapl-import.cmake.in       | 25 +++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)
 delete mode 100644 cmake/mapl-import.cmake.in
 create mode 100644 mapl-import.cmake.in

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a68810e478e4..2603397c4227 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.4] - 2023-09-01
+
+### Fixed
+
+- Fixed handling of MAPL dependencies for when `find_package(MAPL)` is used
+
 ## [2.40.3] - 2023-08-03
 
 ### Changed
diff --git a/cmake/mapl-import.cmake.in b/cmake/mapl-import.cmake.in
deleted file mode 100644
index 2d43afdb8051..000000000000
--- a/cmake/mapl-import.cmake.in
+++ /dev/null
@@ -1,3 +0,0 @@
-list (APPEND CMAKE_MODULE_PATH @MAPL_FULL_INSTALL_DATA_DIR@/cmake)
-include (mapl_create_stub_component)
-include (mapl_acg)
diff --git a/mapl-import.cmake.in b/mapl-import.cmake.in
new file mode 100644
index 000000000000..b71c142e9991
--- /dev/null
+++ b/mapl-import.cmake.in
@@ -0,0 +1,25 @@
+include(CMakeFindDependencyMacro)
+
+set(GFTL_FOUND @GFTL_FOUND@)
+if(GFTL_FOUND)
+   find_dependency(GFTL HINTS @GFTL_DIR@)
+endif()
+
+set(GFTL_SHARED_FOUND @GFTL_SHARED_FOUND@)
+if(GFTL_SHARED_FOUND)
+   find_dependency(GFTL_SHARED HINTS @GFTL_SHARED_DIR@)
+endif()
+
+set(FARGPARSE_FOUND @FARGPARSE_FOUND@)
+if(FARGPARSE_FOUND)
+   find_dependency(FARGPARSE HINTS @FARGPARSE_DIR@)
+endif()
+
+set(PFLOGGER_FOUND @PFLOGGER_FOUND@)
+if(PFLOGGER_FOUND)
+   find_dependency(PFLOGGER HINTS @PFLOGGER_DIR@)
+endif()
+
+list (APPEND CMAKE_MODULE_PATH @MAPL_FULL_INSTALL_DATA_DIR@/cmake)
+include (mapl_create_stub_component)
+include (mapl_acg)

From 3e3606561f5ee62f9ee65e8bc77cfca12d944d97 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Wed, 30 Aug 2023 15:16:16 -0400
Subject: [PATCH 2/3] Add more dependencies

---
 mapl-import.cmake.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mapl-import.cmake.in b/mapl-import.cmake.in
index b71c142e9991..d7b4afd38821 100644
--- a/mapl-import.cmake.in
+++ b/mapl-import.cmake.in
@@ -1,5 +1,9 @@
 include(CMakeFindDependencyMacro)
 
+find_dependency(MPI COMPONENTS Fortran REQUIRED)
+find_dependency(NetCDF COMPONENTS Fortran REQUIRED)
+find_dependency(OpenMP COMPONENTS Fortran REQUIRED)
+
 set(GFTL_FOUND @GFTL_FOUND@)
 if(GFTL_FOUND)
    find_dependency(GFTL HINTS @GFTL_DIR@)

From 18fc54fe10304af0c7f79c249e0df94556eeb0ff Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Thu, 14 Sep 2023 13:21:52 -0400
Subject: [PATCH 3/3] Update date for release

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2603397c4227..8c27f717a10b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
-## [2.40.4] - 2023-09-01
+## [2.40.4] - 2023-09-14
 
 ### Fixed