From 0bbe94704a27a049b6acecede5fad7cf63b7af66 Mon Sep 17 00:00:00 2001
From: Eduard Valeyev <eduard@valeyev.net>
Date: Fri, 25 Jun 2021 11:42:05 -0500
Subject: [PATCH] removed residual uses of TA_DEFAULT_ERROR

---
 external/madness.cmake | 10 ++++------
 external/umpire.cmake  |  8 +++++++-
 tests/CMakeLists.txt   |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/external/madness.cmake b/external/madness.cmake
index 730bdce125..a3dddd0f0f 100644
--- a/external/madness.cmake
+++ b/external/madness.cmake
@@ -139,14 +139,12 @@ else()
   
   # Setup configure variables
 
-  # Set error handling method (for TA_DEFAULT_ERROR values see top-level CMakeLists.txt)
-  if(TA_DEFAULT_ERROR EQUAL 0)
+  # Set error handling method (for TA_ASSERT_POLICY allowed values see top-level CMakeLists.txt)
+  if(TA_ASSERT_POLICY EQUAL TA_ASSERT_IGNORE)
     set(_MAD_ASSERT_TYPE disable)
-  elseif(TA_DEFAULT_ERROR EQUAL 1)
+  elseif(TA_ASSERT_POLICY EQUAL TA_ASSERT_THROW)
     set(_MAD_ASSERT_TYPE throw)
-  elseif(TA_DEFAULT_ERROR EQUAL 2)
-    set(_MAD_ASSERT_TYPE assert)
-  elseif(TA_DEFAULT_ERROR EQUAL 3)
+  elseif(TA_ASSERT_POLICY EQUAL TA_ASSERT_ABORT)
     set(_MAD_ASSERT_TYPE abort)
   endif()
   set(MAD_ASSERT_TYPE ${_MAD_ASSERT_TYPE} CACHE INTERNAL "MADNESS assert type")
diff --git a/external/umpire.cmake b/external/umpire.cmake
index 63395205f5..ad8632e2c0 100644
--- a/external/umpire.cmake
+++ b/external/umpire.cmake
@@ -43,6 +43,12 @@ else()
     ## use patched BLT
     include(FetchBLT)
 
+    if (TA_ASSERT_POLICY EQUAL TA_ASSERT_IGNORE)
+        set(enable_umpire_asserts OFF)
+    else()
+        set(enable_umpire_asserts ON)
+    endif()
+
     set(UMPIRE_CMAKE_ARGS
         -DCMAKE_INSTALL_PREFIX=${EXTERNAL_INSTALL_DIR}
         -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
@@ -71,7 +77,7 @@ else()
         -DENABLE_TESTS=OFF
         -DENABLE_EXAMPLES=OFF
         -DENABLE_LOGGING=OFF
-        -DENABLE_ASSERTS=${TA_DEFAULT_ERROR}
+        -DENABLE_ASSERTS=${enable_umpire_asserts}
         -DCMAKE_CUDA_COMPILER=${CMAKE_CUDA_COMPILER}
         -DCMAKE_CUDA_STANDARD=${CMAKE_CUDA_STANDARD}
         -DCMAKE_CUDA_EXTENSIONS=${CMAKE_CUDA_EXTENSIONS}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d75c0f8e5f..e16729bec0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -120,7 +120,7 @@ if(CUDA_FOUND)
 endif()
 
 # if tiledarray library was compiled without exceptions, use TA header-only (see below)
-if (NOT TA_DEFAULT_ERROR EQUAL 1 AND NOT CUDA_FOUND AND FALSE)
+if (NOT (TA_ASSERT_POLICY EQUAL TA_ASSERT_THROW) AND NOT CUDA_FOUND AND FALSE)
   add_ta_executable(${executable} "${ta_test_src_files}" "MADworld;${TILEDARRAY_PRIVATE_LINK_LIBRARIES}")
   target_compile_definitions(${executable} PRIVATE TILEDARRAY_HEADER_ONLY=1)
   if (LAPACK_INCLUDE_DIRS)