Merge pull request #2936 from GEOS-ESM/feature/mathomp4/clarify-chang…

…elog Clarify changelog for udunits dependency, reorder cmake
GEOS-ESM · Jul 31, 2024 · 5c689f7 · 5c689f7
2 parents 95a4c96 + b14b29c
commit 5c689f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Added Fortran interface to UDUNITS2
+  - NOTE: This now means MAPL depends on UDUNITS2 (and transitively, expat)
 - Improve mask sampler by adding an MPI step and a LS_chunk (intermediate step)
 - Update Baselibs in CI to 7.25.0
   - NOTE: The docker image also updates to Intel 2024.2 and Intel MPI 2021.13

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -218,6 +218,7 @@ if (APPLE)
   add_compile_definitions("-D__DARWIN")
 endif()
 
+add_subdirectory (udunits2f)
 add_subdirectory (pfio)
 add_subdirectory (profiler)
 add_subdirectory (generic)
@@ -229,7 +230,6 @@ add_subdirectory (base)
 add_subdirectory (MAPL)
 add_subdirectory (gridcomps)
 add_subdirectory (griddedio)
-add_subdirectory (udunits2f)
 if (BUILD_WITH_FARGPARSE)
    add_subdirectory (docs)
    add_subdirectory (benchmarks)