From f9f704c7ececcd3abfbb452666f639b9c6185e5e Mon Sep 17 00:00:00 2001 From: Francesco Rizzi Date: Thu, 21 Nov 2024 09:36:21 +0100 Subject: [PATCH] fix logic for epetra --- include/pressio/ops_macros.hpp | 6 ++++++ include/pressio/type_traits/native_epetra_vector.hpp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/pressio/ops_macros.hpp b/include/pressio/ops_macros.hpp index 007777c..635fa97 100644 --- a/include/pressio/ops_macros.hpp +++ b/include/pressio/ops_macros.hpp @@ -69,6 +69,12 @@ static_assert(_PRESSIO_CPLUSPLUS >= PRESSIO_CXX_STD_17, "PRESSIO requires C++17 // ---------------------------------------- // TPL macros // ---------------------------------------- +#if defined PRESSIO_ENABLE_EPETRA +#if !defined PRESSIO_ENABLE_TPL_TRILINOS +#define PRESSIO_ENABLE_TPL_TRILINOS +#endif +#endif + #if defined PRESSIO_ENABLE_TPL_TRILINOS // if trilinos enabled, kokkos and MPI should be too #if !defined PRESSIO_ENABLE_TPL_KOKKOS diff --git a/include/pressio/type_traits/native_epetra_vector.hpp b/include/pressio/type_traits/native_epetra_vector.hpp index cdbe869..b5f0c44 100644 --- a/include/pressio/type_traits/native_epetra_vector.hpp +++ b/include/pressio/type_traits/native_epetra_vector.hpp @@ -49,7 +49,7 @@ #ifndef PRESSIOOPS_TYPE_TRAITS_NATIVE_EPETRA_VECTOR_HPP_ #define PRESSIOOPS_TYPE_TRAITS_NATIVE_EPETRA_VECTOR_HPP_ -#ifdef PRESSIO_ENABLE_TPL_TRILINOS +#ifdef PRESSIO_ENABLE_TPL_EPETRA #include "Epetra_Vector.h" #include "Epetra_MultiVector.h" #endif @@ -59,7 +59,7 @@ namespace pressio{ template struct is_vector_epetra : std::false_type {}; -#ifdef PRESSIO_ENABLE_TPL_TRILINOS +#ifdef PRESSIO_ENABLE_TPL_EPETRA template struct is_vector_epetra