From: maier Date: Wed, 10 Apr 2013 09:52:41 +0000 (+0000) Subject: CMake: Sanitize the include path given by TrilinosConfig.cmake... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=210b19a476ea9159a669d9ae96a004866b324612;p=dealii-svn.git CMake: Sanitize the include path given by TrilinosConfig.cmake... git-svn-id: https://svn.dealii.org/trunk@29239 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/configure/configure_trilinos.cmake b/deal.II/cmake/configure/configure_trilinos.cmake index 89f15e33ff..825d304ab3 100644 --- a/deal.II/cmake/configure/configure_trilinos.cmake +++ b/deal.II/cmake/configure/configure_trilinos.cmake @@ -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}