]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Trilinos detection in cc file
authorGuido Kanschat <dr.guido.kanschat@gmail.com>
Thu, 1 Jul 2010 20:35:06 +0000 (20:35 +0000)
committerGuido Kanschat <dr.guido.kanschat@gmail.com>
Thu, 1 Jul 2010 20:35:06 +0000 (20:35 +0000)
git-svn-id: https://svn.dealii.org/trunk@21438 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/common/Make.global_options.in
deal.II/common/scripts/report_features.cc

index f3d6928f9cd0ac1266a782f5ae42ac4e32a6b8f8..0df101db329c1406237cdbd6d09749955a9c533e 100644 (file)
@@ -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
index 0bae78f8dde22dce76daca279a62bf96e83b4a61..cbac079b23a0f8772e050f4cfc3a12b2b9a575ae 100644 (file)
@@ -25,6 +25,10 @@ extern "C" {
 #include <mpi.h>
 #endif
 
+#ifdef DEAL_II_USE_TRILINOS
+#  include <Trilinos_version.h>
+#endif
+
 #ifdef DEAL_II_USE_MUMPS
 #  include <base/utilities.h>
 #  include <dmumps_c.h>
@@ -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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.