From: Matthias Maier Date: Wed, 26 Sep 2018 07:21:33 +0000 (-0500) Subject: CMake: Also populate TRILINOS_LINKER_FLAGS X-Git-Tag: v9.1.0-rc1~690^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9197bb22e3a82b06e3c0b19a63e3934bc9ccca39;p=dealii.git CMake: Also populate TRILINOS_LINKER_FLAGS In case we pick up a trilinos installation where Trilinos_EXTRA_LD_FLAGS we have to make sure to include these flags on our final link line as well. Closes #7226 --- diff --git a/cmake/modules/FindTRILINOS.cmake b/cmake/modules/FindTRILINOS.cmake index a0021b3398..c1f42bf3e5 100644 --- a/cmake/modules/FindTRILINOS.cmake +++ b/cmake/modules/FindTRILINOS.cmake @@ -21,6 +21,7 @@ # TRILINOS_DIR # TRILINOS_INCLUDE_DIRS # TRILINOS_LIBRARIES +# TRILINOS_LINKER_FLAGS # TRILINOS_VERSION # TRILINOS_VERSION_MAJOR # TRILINOS_VERSION_MINOR @@ -158,6 +159,8 @@ DEAL_II_PACKAGE_HANDLE(TRILINOS USER_INCLUDE_DIRS REQUIRED Trilinos_INCLUDE_DIRS OPTIONAL Trilinos_TPL_INCLUDE_DIRS + LINKER_FLAGS + OPTIONAL Trilinos_EXTRA_LD_FLAGS CLEAR TRILINOS_CONFIG_DIR EPETRA_CONFIG_H SACADO_CMATH_HPP ${_libraries} SACADO_CONFIG_H