From ce9eeeb9c909c425ea95b3c9ef7752abccbf1a22 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Wed, 16 Oct 2019 08:29:12 -0600 Subject: [PATCH] ATDM: Set Amesos2_ENABLE_Epetra=OFF unconditionally (ATDV-202) This is set in EMPIRE's native configuration driver and therefore should be set unconditionally. Before, it was only set for the SPARC configuration. --- cmake/std/atdm/ATDMDevEnvSettings.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/std/atdm/ATDMDevEnvSettings.cmake b/cmake/std/atdm/ATDMDevEnvSettings.cmake index 053e8b6df84a..a3bc0f565bcb 100644 --- a/cmake/std/atdm/ATDMDevEnvSettings.cmake +++ b/cmake/std/atdm/ATDMDevEnvSettings.cmake @@ -282,6 +282,7 @@ ATDM_SET_CACHE(Tpetra_INST_CUDA "${ATDM_USE_CUDA}" CACHE BOOL) ATDM_SET_CACHE(Tpetra_INST_SERIAL "${ATDM_INST_SERIAL}" CACHE BOOL) ATDM_SET_CACHE(Tpetra_INST_INT_INT OFF CACHE BOOL) ATDM_SET_CACHE(Xpetra_ENABLE_Epetra OFF CACHE BOOL) +ATDM_SET_CACHE(Amesos2_ENABLE_Epetra OFF CACHE BOOL) ATDM_SET_CACHE(MueLu_ENABLE_Kokkos_Refactor_Use_By_Default ON CACHE BOOL) ATDM_SET_CACHE(MueLu_ENABLE_Epetra OFF CACHE BOOL) ATDM_SET_CACHE(Piro_ENABLE_MueLu OFF CACHE BOOL) @@ -292,7 +293,6 @@ ATDM_SET_CACHE(DART_TESTING_TIMEOUT 600 CACHE STRING) IF (ATDM_ENABLE_SPARC_SETTINGS) ATDM_SET_CACHE(Zoltan_ENABLE_ULLONG_IDS ON CACHE BOOL) ATDM_SET_CACHE(Anasazi_ENABLE_RBGen ON CACHE BOOL) - ATDM_SET_CACHE(Amesos2_ENABLE_Epetra OFF CACHE BOOL) ENDIF() #