]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
CMake: Sanitize the include path given by TrilinosConfig.cmake...
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 10 Apr 2013 09:52:41 +0000 (09:52 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 10 Apr 2013 09:52:41 +0000 (09:52 +0000)
git-svn-id: https://svn.dealii.org/trunk@29239 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/configure/configure_trilinos.cmake

index 89f15e33ffa6ec1b6b68572dc9ce5314f17d1842..825d304ab33ec44d90113e27083102f2c97c7c25 100644 (file)
@@ -185,12 +185,19 @@ ENABLE_IF_SUPPORTED(_dummy "-Wno-extra")
 ENABLE_IF_SUPPORTED(_dummy "-Wno-overloaded-virtual")
 
 MACRO(FEATURE_TRILINOS_CONFIGURE_EXTERNAL)
+  #
+  # *Boy* Sanitize the include paths given by TrilinosConfig.cmake...
+  #
+  STRING(REGEX REPLACE
+    "(lib64|lib)\\/cmake\\/Trilinos\\/\\.\\.\\/\\.\\.\\/\\.\\.\\/" ""
+    TRILINOS_INCLUDE_DIRS "${TRILINOS_INCLUDE_DIRS}"
+    )
+
   INCLUDE_DIRECTORIES(${TRILINOS_INCLUDE_DIRS})
 
   # 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}

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.