take over r32021

git-svn-id: https://svn.dealii.org/branches/releases/Branch-8-1@32022 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/modules/FindDEALII_LAPACK.cmake b/deal.II/cmake/modules/FindDEALII_LAPACK.cmake
index 84b6a37d3f633edd17fd5dea7b8c486bf0520365..2033f4cf0d4fa976168826f98428adcfd115f2dc 100644 (file)
--- a/deal.II/cmake/modules/FindDEALII_LAPACK.cmake
+++ b/deal.II/cmake/modules/FindDEALII_LAPACK.cmake
@@ -53,6 +53,7 @@ SET(CMAKE_PREFIX_PATH ${_cmake_prefix_path_backup})
 MARK_AS_ADVANCED(
   atlas_LIBRARY
   blas_LIBRARY
+  eigen_blas_LIBRARY
   gslcblas_LIBRARY
   lapack_LIBRARY
   m_LIBRARY

diff --git a/deal.II/cmake/modules/FindTRILINOS.cmake b/deal.II/cmake/modules/FindTRILINOS.cmake
index a19b46bd448aa8503b9004d31b775d2300a33a37..8857da9f824c74fad42b1acbc6f511f7fbdd6163 100644 (file)
--- a/deal.II/cmake/modules/FindTRILINOS.cmake
+++ b/deal.II/cmake/modules/FindTRILINOS.cmake
@@ -127,7 +127,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(TRILINOS DEFAULT_MSG
   ${TRILINOS_LIBRARY_VARIABLES}
   )
 
-MARK_AS_ADVANCED(TRILINOS_CONFIG EPETRA_CONFIG_H)
+MARK_AS_ADVANCED(TRILINOS_CONFIG_DIR EPETRA_CONFIG_H)
 
 IF(TRILINOS_FOUND)
   #

diff --git a/deal.II/cmake/setup_cached_variables.cmake b/deal.II/cmake/setup_cached_variables.cmake
index 6302955d101a9fec4eb9ae939b56564dcb7ea537..e090291358219b7cbe00e431d50f368523df06b9 100644 (file)
--- a/deal.II/cmake/setup_cached_variables.cmake
+++ b/deal.II/cmake/setup_cached_variables.cmake
@@ -149,7 +149,7 @@ OPTION(DEAL_II_SETUP_COVERAGE
   "Setup debug compiler flags to provide additional test coverage information. Currently only gprof is supported."
   OFF
   )
-MARK_AS_ADVANCED(DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS)
+MARK_AS_ADVANCED(DEAL_II_SETUP_COVERAGE)
 
 SET(BUILD_SHARED_LIBS "ON" CACHE BOOL
   "Build a shared library"