From 1f20103dcbb4e4d1dd02c96016229886f0f55023 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 30 Aug 2023 22:35:27 +0000 Subject: [PATCH 1/3] Workaround for bug in MAPL cmake configuration until https://github.com/GEOS-ESM/MAPL/pull/2320 is merged and finds its way into the ufs-weather-model dependency tree --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b20e22c..d9175d08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,6 +61,11 @@ endif () if (UFS_GOCART) find_package (GFTL_SHARED REQUIRED) + # Dom Heinzeller 2023/08/30 - workaround until https://github.com/GEOS-ESM/MAPL/pull/2320 + # is merged and finds its way into the ufs-weather-model dependency tree + find_package (FARGPARSE QUIET) + find_package (PFLOGGER QUIET) + # find_package (MAPL REQUIRED) include(mapl_acg) elseif (IS_DIRECTORY "${PROJECT_SOURCE_DIR}/ESMF/Shared/MAPL@") From d51106d7ac4cd30b06091767f4c94815b03270b8 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 7 Sep 2023 19:36:27 +0000 Subject: [PATCH 2/3] Another workaround for bug in MAPL cmake configuration until https://github.com/GEOS-ESM/MAPL/pull/2320 is merged and finds its way into the ufs-weather-model dependency tree --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d9175d08..d2e7fb93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,7 @@ if (UFS_GOCART) find_package (GFTL_SHARED REQUIRED) # Dom Heinzeller 2023/08/30 - workaround until https://github.com/GEOS-ESM/MAPL/pull/2320 # is merged and finds its way into the ufs-weather-model dependency tree + find_package (YAFYAML QUIET) find_package (FARGPARSE QUIET) find_package (PFLOGGER QUIET) # From f292fd25bb5f4db28195608c86c665a0a0147012 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 25 Sep 2023 12:18:27 -0400 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25023cc6..dc417287 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 +- Add explicit `find_package()` calls for missing dependencies for MAPL for builds with spack-stack. Will eventually be fixed in MAPL in later versions + ### Added ### Changed