diff --git a/CMakeLists.txt b/CMakeLists.txt
index a23c498..f2b56a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,9 +18,11 @@ set (srcs
   )
 
 if (ESMA_USE_GFE_NAMESPACE)
-  set(dependencies MAPL GFTL_SHARED::gftl-shared GMAO_hermes GEOS_Shared)
+  set(dependencies MAPL GFTL_SHARED::gftl-shared GMAO_hermes GEOS_Shared
+    $<$<NOT:$<BOOL:${USE_GFDL_MP_FROM_FV}>>:GEOSmoist_GridComp>)
 else ()
-  set(dependencies MAPL gftl-shared GMAO_hermes GEOS_Shared)
+  set(dependencies MAPL gftl-shared GMAO_hermes GEOS_Shared
+    $<$<NOT:$<BOOL:${USE_GFDL_MP_FROM_FV}>>:GEOSmoist_GridComp>)
 endif ()
 
 esma_add_library (${this}
@@ -49,6 +51,9 @@ elseif (FV_PRECISION MATCHES R4R8) # FV is R4 but FMS is R8
   target_compile_definitions (${this} PRIVATE -DSINGLE_FV -DOVERLOAD_R4)
 endif ()
 
+if (USE_GFDL_MP_FROM_FV)
+  target_compile_definitions (${this} PRIVATE USE_GFDL_MP_FROM_FV)
+endif ()
 
 set (CMAKE_Fortran_FLAGS_RELEASE "${GEOS_Fortran_FLAGS_VECT}")
 
diff --git a/FV_StateMod.F90 b/FV_StateMod.F90
index 258ce95..efff9f5 100644
--- a/FV_StateMod.F90
+++ b/FV_StateMod.F90
@@ -31,7 +31,11 @@ module FV_StateMod
    use fv_update_phys_mod, only: fv_update_phys
    use sw_core_mod, only: d2a2c_vect
    use fv_sg_mod, only: fv_subgrid_z
+#ifdef USE_GFDL_MP_FROM_FV
    use gfdl_cloud_microphys_mod, only: gfdl_cloud_microphys_init
+#else
+   use gfdl2_cloud_microphys_mod, only: gfdl_cloud_microphys_init ! gfdl_cloud_microphys_mod as gfdl2_cloud_microphysics from moist
+#endif
 
    use fv_diagnostics_mod, only: prt_maxmin, prt_minmax