Skip to content

Commit

Permalink
fix logic for epetra
Browse files Browse the repository at this point in the history
  • Loading branch information
Francesco Rizzi committed Nov 21, 2024
1 parent 8f0ca72 commit f9f704c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions include/pressio/ops_macros.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions include/pressio/type_traits/native_epetra_vector.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -59,7 +59,7 @@ namespace pressio{
template <typename T, typename enable = void>
struct is_vector_epetra : std::false_type {};

#ifdef PRESSIO_ENABLE_TPL_TRILINOS
#ifdef PRESSIO_ENABLE_TPL_EPETRA
template <typename T>
struct is_vector_epetra<T,
typename
Expand Down

0 comments on commit f9f704c

Please sign in to comment.