]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CMake: Bugfix: Make the requirement for Trilinos_TPL_INCLUDE_DIRS optional 668/head
authorMatthias Maier <tamiko@43-1.org>
Mon, 16 Mar 2015 16:02:57 +0000 (17:02 +0100)
committerMatthias Maier <tamiko@43-1.org>
Mon, 16 Mar 2015 16:02:57 +0000 (17:02 +0100)
cmake/modules/FindTRILINOS.cmake

index 3f75d423199a5f3593e373808d0ea02609a0753f..53c1167455051859d9f09d8f3d0565e9c98730c2 100644 (file)
@@ -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

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.