From 4814c50d9a7f59d9a75a5f1bed3292b3a3b65fe1 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 16 Mar 2015 17:02:57 +0100 Subject: [PATCH] CMake: Bugfix: Make the requirement for Trilinos_TPL_INCLUDE_DIRS optional --- cmake/modules/FindTRILINOS.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/modules/FindTRILINOS.cmake b/cmake/modules/FindTRILINOS.cmake index 3f75d42319..53c1167455 100644 --- a/cmake/modules/FindTRILINOS.cmake +++ b/cmake/modules/FindTRILINOS.cmake @@ -180,12 +180,14 @@ ENDFOREACH() DEAL_II_PACKAGE_HANDLE(TRILINOS LIBRARIES - REQUIRED ${_libraries} Trilinos_TPL_LIBRARIES - OPTIONAL MPI_CXX_LIBRARIES + REQUIRED ${_libraries} + OPTIONAL Trilinos_TPL_LIBRARIES MPI_CXX_LIBRARIES INCLUDE_DIRS - REQUIRED Trilinos_INCLUDE_DIRS Trilinos_TPL_INCLUDE_DIRS + REQUIRED Trilinos_INCLUDE_DIRS + OPTIONAL Trilinos_TPL_INCLUDE_DIRS USER_INCLUDE_DIRS - REQUIRED Trilinos_INCLUDE_DIRS Trilinos_TPL_INCLUDE_DIRS + REQUIRED Trilinos_INCLUDE_DIRS + OPTIONAL Trilinos_TPL_INCLUDE_DIRS CLEAR TRILINOS_CONFIG_DIR EPETRA_CONFIG_H SACADO_CMATH_HPP ${_libraries} TRILINOS_SUPPORTS_CPP11 TRILINOS_HAS_C99_TR1_WORKAROUND -- 2.39.5