From 783e4b8f566113d8b26e431653b27add1a8e151b Mon Sep 17 00:00:00 2001 From: Guido Kanschat Date: Thu, 1 Jul 2010 20:35:06 +0000 Subject: [PATCH] Trilinos detection in cc file git-svn-id: https://svn.dealii.org/trunk@21438 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/common/Make.global_options.in | 1 - deal.II/common/scripts/report_features.cc | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index f3d6928f9c..0df101db32 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -375,7 +375,6 @@ print-summary: @echo "dealii-feature: shared_libs=$(enable-shared)" @echo "dealii-feature: parser=$(subst no,,$(enable-parser))" @echo "dealii-feature: PETSc=$(subst ..,,$(DEAL_II_PETSC_VERSION_MAJOR).$(DEAL_II_PETSC_VERSION_MINOR).$(DEAL_II_PETSC_VERSION_SUBMINOR))" - @echo "dealii-feature: Trilinos=$(subst ..,,$(DEAL_II_TRILINOS_VERSION_MAJOR).$(DEAL_II_TRILINOS_VERSION_MINOR).$(DEAL_II_TRILINOS_VERSION_SUBMINOR))" @echo "dealii-feature: METIS=$(subst no,,$(USE_CONTRIB_METIS))" @cd $D/common/scripts ; make report_features && ./report_features endif diff --git a/deal.II/common/scripts/report_features.cc b/deal.II/common/scripts/report_features.cc index 0bae78f8dd..cbac079b23 100644 --- a/deal.II/common/scripts/report_features.cc +++ b/deal.II/common/scripts/report_features.cc @@ -25,6 +25,10 @@ extern "C" { #include #endif +#ifdef DEAL_II_USE_TRILINOS +# include +#endif + #ifdef DEAL_II_USE_MUMPS # include # include @@ -65,6 +69,19 @@ int main() # endif #endif +#ifdef DEAL_II_USE_TRILINOS +# ifdef TRILINOS_VERSION_STRING + std::cout << "dealii-feature: Trilinos=" << TRILINOS_VERSION_STRING << std::endl; +# else + const unsigned int trilinos_subminor = TRILINOS_MAJOR_MINOR_VERSION % 100; + const unsigned int trilinos_minor = (TRILINOS_MAJOR_MINOR_VERSION/100) % 100; + std::cout << "dealii-feature: Trilinos=" + << TRILINOS_MAJOR_VERSION << '.' + << trilinos_minor << '.' + << trilinos_subminor << std::endl; +# endif +#endif + #ifdef DEAL_II_USE_MUMPS std::cout << "dealii-feature: MUMPS=yes" << std::endl; #endif -- 2.39.5