Merge Pull Request #12182 from hkthorn/Trilinos/develop

Automatically Merged using Trilinos Pull Request AutoTester PR Title: b'Ifpack2: Adds missing cmake logic to address test dependency on Xpetra' PR Author: hkthorn
trilinos · Aug 30, 2023 · e764653 · e764653
2 parents 090741e + f46467a
commit e764653
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git a/packages/ifpack2/test/unit_tests/CMakeLists.txt b/packages/ifpack2/test/unit_tests/CMakeLists.txt
@@ -152,6 +152,9 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST(
   STANDARD_PASS_OUTPUT
   )
 
+ASSERT_DEFINED (${PACKAGE_NAME}_ENABLE_Xpetra)
+ASSERT_DEFINED (${PACKAGE_NAME}_ENABLE_Galeri)
+IF(${PACKAGE_NAME}_ENABLE_Xpetra AND ${PACKAGE_NAME}_ENABLE_Galeri)
 TRIBITS_ADD_EXECUTABLE_AND_TEST(
   ILUTSingleProcessUnitTests
   SOURCES
@@ -162,6 +165,7 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST(
   NUM_MPI_PROCS 1
   STANDARD_PASS_OUTPUT
   )
+ENDIF ()
 
 IF(Tpetra_INST_DOUBLE AND ${PACKAGE_NAME}_ENABLE_Experimental_KokkosKernels_Features)
   TRIBITS_ADD_EXECUTABLE_AND_TEST(

diff --git a/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestILUT.cpp b/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestILUT.cpp
@@ -53,23 +53,6 @@
 #include <Teuchos_ConfigDefs.hpp>
 #include <Teuchos_UnitTestHarness.hpp>
 #include <Ifpack2_ConfigDefs.hpp>
-
-// Xpetra / Galeri
-#ifdef HAVE_IFPACK2_XPETRA
-#include "Xpetra_ConfigDefs.hpp"
-#include "Xpetra_DefaultPlatform.hpp"
-#include "Xpetra_Parameters.hpp"
-#include "Xpetra_MapFactory.hpp"
-#include "Xpetra_TpetraMap.hpp"
-#include "Xpetra_CrsMatrix.hpp"
-#include "Xpetra_TpetraCrsMatrix.hpp"
-#include "Galeri_XpetraProblemFactory.hpp"
-#include "Galeri_XpetraMatrixTypes.hpp"
-#include "Galeri_XpetraParameters.hpp"
-#include "Galeri_XpetraUtils.hpp"
-#include "Galeri_XpetraMaps.hpp"
-#endif // HAVE_IFPACK2_XPETRA
-
 #include <Ifpack2_Version.hpp>
 
 #include <Ifpack2_UnitTestHelpers.hpp>

diff --git a/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestSingleProcessILUT.cpp b/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestSingleProcessILUT.cpp
@@ -55,7 +55,6 @@
 #include <Ifpack2_ConfigDefs.hpp>
 
 // Xpetra / Galeri
-#ifdef HAVE_IFPACK2_XPETRA
 #include "Xpetra_ConfigDefs.hpp"
 #include "Xpetra_DefaultPlatform.hpp"
 #include "Xpetra_Parameters.hpp"
@@ -68,7 +67,6 @@
 #include "Galeri_XpetraParameters.hpp"
 #include "Galeri_XpetraUtils.hpp"
 #include "Galeri_XpetraMaps.hpp"
-#endif // HAVE_IFPACK2_XPETRA
 
 #include <Ifpack2_Version.hpp>