CMake: Fix Trilinos' link interface

git-svn-id: https://svn.dealii.org/trunk@29993 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/configure/configure_trilinos.cmake b/deal.II/cmake/configure/configure_trilinos.cmake
index d7e08f752ffebb7605e2229e38b13f32a657c7e0..3194dcd1b61c8c133e1f89c4b31671a904f99d42 100644 (file)
--- a/deal.II/cmake/configure/configure_trilinos.cmake
+++ b/deal.II/cmake/configure/configure_trilinos.cmake
@@ -238,13 +238,7 @@ MACRO(FEATURE_TRILINOS_CONFIGURE_EXTERNAL)
   # The user has to know the location of the trilinos headers as well:
   LIST(APPEND DEAL_II_USER_INCLUDE_DIRS ${TRILINOS_INCLUDE_DIRS})
 
-  LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES
-    # The Trilinos libraries:
-    ${TRILINOS_LIBRARIES}
-    # All external libraries necessary for the Trilinos libraries. Nice and
-    # easy :-)
-    ${Trilinos_TPL_LIBRARIES}
-    )
+  LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${TRILINOS_LIBRARIES})
 
   SET(DEAL_II_EXPAND_TRILINOS_VECTOR "TrilinosWrappers::Vector")
   SET(DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR "TrilinosWrappers::BlockVector")

diff --git a/deal.II/cmake/modules/FindTRILINOS.cmake b/deal.II/cmake/modules/FindTRILINOS.cmake
index d038db322a08bad217480d0a67b22575e7f26e02..b9bbe6f0efb44bd01610a2704107bd7639ac3508 100644 (file)
--- a/deal.II/cmake/modules/FindTRILINOS.cmake
+++ b/deal.II/cmake/modules/FindTRILINOS.cmake
@@ -76,6 +76,14 @@ FOREACH(_library ${Trilinos_LIBRARIES})
   UNSET(TRILINOS_LIBRARY_${_library} CACHE)
 ENDFOREACH()
 
+#
+# Add the link interface:
+#
+LIST(APPEND TRILINOS_LIBRARIES
+  ${Trilinos_TPL_LIBRARIES}
+  ${MPI_CXX_LIBRARIES} # for good measure
+  )
+
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(TRILINOS DEFAULT_MSG
   TRILINOS_LIBRARIES # cosmetic: Gives nice output
   TRILINOS_CONFIG_FOUND