From: Matthias Maier <tamiko@43-1.org>
Date: Mon, 16 Mar 2015 16:02:57 +0000 (+0100)
Subject: CMake: Bugfix: Make the requirement for Trilinos_TPL_INCLUDE_DIRS optional
X-Git-Tag: v8.3.0-rc1~371^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F668%2Fhead;p=dealii.git

CMake: Bugfix: Make the requirement for Trilinos_TPL_INCLUDE_DIRS optional
---

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