From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Fri, 5 Apr 2013 21:50:31 +0000 (+0000)
Subject: CMake: Speedup cache run when Trilinos is enabled
X-Git-Tag: v8.0.0~765
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=963e4a7fd92c539b74eed63eedcc24fc2076664f;p=dealii.git

CMake: Speedup cache run when Trilinos is enabled

git-svn-id: https://svn.dealii.org/trunk@29206 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/cmake/setup_finalize.cmake b/deal.II/cmake/setup_finalize.cmake
index 879a7e2968..e5d1ae9ab8 100644
--- a/deal.II/cmake/setup_finalize.cmake
+++ b/deal.II/cmake/setup_finalize.cmake
@@ -132,7 +132,8 @@ _both("DEAL_II_ALLOW_AUTODETECTION = ${DEAL_II_ALLOW_AUTODETECTION}):\n")
 
 
 #
-# Cache for quicker access:
+# Cache for quicker access to avoid the O(n^2) complexity of a loop over
+# _all_ defined variables.
 #
 GET_CMAKE_PROPERTY(_variables VARIABLES)
 FOREACH(_var ${_variables})
@@ -140,7 +141,11 @@ FOREACH(_var ${_variables})
     LIST(APPEND _features "${_var}")
   ELSEIF(_var MATCHES "DEAL_II_COMPONENT")
     LIST(APPEND _components "${_var}")
-  ELSEIF(_var MATCHES "(COMPILER|COMPILE_FLAGS|LINK_FLAGS|LIBRARIES|INCLUDE_PATH|INCLUDE_DIRS|LINKER_FLAGS)")
+  ELSEIF(_var MATCHES "(MPI_CXX_COMPILER|MPI_CXX_COMPILE_FLAGS|MPI_CXX_LINK_FLAGS)")
+    LIST(APPEND _features_config ${_var})
+  ELSEIF(_var MATCHES "(LIBRARIES|INCLUDE_PATH|INCLUDE_DIRS|LINKER_FLAGS)"
+         # Avoid a lot of Trilinos variables:
+         AND (NOT _var MATCHES "_TPL_|_MPI_") )
     LIST(APPEND _features_config ${_var})
   ENDIF()
 ENDFOREACH()