diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a136162c..c82b5c8c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,7 +83,7 @@ endif()
 # Include Umpire for pool allocation
 if((${PARFLOW_HAVE_CUDA}) OR (${PARFLOW_HAVE_KOKKOS}))
   if(DEFINED umpire_ROOT)
-    find_package(umpire)
+    find_package(umpire REQUIRED)
     set(PARFLOW_HAVE_UMPIRE "yes")
     message(STATUS "ACCELERATOR: Compiling with CUDA and Umpire")
   endif(DEFINED umpire_ROOT)
diff --git a/cmake/parflow_config.h.in b/cmake/parflow_config.h.in
index 6149881ee..10dfd04f3 100644
--- a/cmake/parflow_config.h.in
+++ b/cmake/parflow_config.h.in
@@ -75,4 +75,6 @@
 
 #cmakedefine PARFLOW_HAVE_OMP
 
+#cmakedefine PARFLOW_HAVE_UMPIRE
+
 #endif // PARFLOW_CONFIG_H
diff --git a/pfsimulator/amps/common/umpire_wrapper.cpp b/pfsimulator/amps/common/umpire_wrapper.cpp
index fb612c293..ec9219bc3 100644
--- a/pfsimulator/amps/common/umpire_wrapper.cpp
+++ b/pfsimulator/amps/common/umpire_wrapper.cpp
@@ -9,7 +9,7 @@
 extern "C" {
   void umpireInit() {
     // Create a pool allocator
-    // Initial size (default: 512MB) and pool increase size (1MB) can be tuned in the constructor. 
+    // Initial size (default: 512MB) and pool increase size (1MB) can be tuned in the constructor.
     auto& rm = umpire::ResourceManager::getInstance();
     auto allocator = rm.getAllocator("UM");
     auto pooled_allocator = rm.makeAllocator<umpire::strategy::DynamicPoolList>("UM_pool", allocator);