Merge pull request #2156 from GEOS-ESM/main

Auto GitFlow - main → develop
GEOS-ESM · May 30, 2023 · 8f447a5 · 8f447a5
2 parents 9ff637c + 4240137
commit 8f447a5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -82,6 +82,8 @@ workflows:
           baselibs_version: *baselibs_version
           repo: MAPL
           mepodevelop: false
+          remove_flap: true
+          remove_pflogger: true
           extra_cmake_options: "-DBUILD_WITH_FLAP=OFF -DBUILD_WITH_PFLOGGER=OFF -DBUILD_WITH_FARGPARSE=OFF -DUSE_EXTDATA2G=OFF -DBUILD_SHARED_MAPL=OFF"
           run_unit_tests: true
           ctest_options: "-LE 'PERFORMANCE|EXTDATA1G_BIG_TESTS|EXTDATA2G_BIG_TESTS' --output-on-failure"

diff --git 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.39.2] - 2023-05-30
+
+### Fixed
+
+- Fix unintentional PFLOGGER requirements in geom and pfio
+
 ## [2.39.1] - 2023-05-16
 
 ### Fixed

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   MAPL
-  VERSION 2.39.1
+  VERSION 2.39.2
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 # Set the default build type to release

diff --git a/geom/CMakeLists.txt b/geom/CMakeLists.txt
@@ -19,11 +19,9 @@ set(srcs
 
 list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 
-#find_package (MPI REQUIRED)
-#find_package (GFTL REQUIRED)
-#find_package (GFTL_SHARED REQUIRED)
-#find_package (YAFYAML REQUIRED)
-find_package (PFLOGGER REQUIRED)
+if (BUILD_WITH_PFLOGGER)
+  find_package (PFLOGGER REQUIRED)
+endif ()
 
 esma_add_library(${this}
   SRCS ${srcs}

diff --git a/pfio/CMakeLists.txt b/pfio/CMakeLists.txt
@@ -112,7 +112,9 @@ else ()
   message(STATUS "netCDF does not have quantize capability")
 endif ()
 
-find_package (PFLOGGER REQUIRED)
+if (BUILD_WITH_PFLOGGER)
+  find_package (PFLOGGER REQUIRED)
+endif ()
 
 esma_add_library (${this} SRCS ${srcs} DEPENDENCIES MAPL.shared MAPL.profiler NetCDF::NetCDF_Fortran NetCDF::NetCDF_C TYPE ${MAPL_LIBRARY_TYPE})
 target_link_libraries (${this} PUBLIC GFTL_SHARED::gftl-shared PFLOGGER::pflogger PRIVATE MPI::MPI_Fortran)