From: maier Date: Sun, 15 Dec 2013 16:51:57 +0000 (+0000) Subject: take over r32021 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e52dcf4070266aaae632be0ca4575bfbc7852e4;p=dealii-svn.git 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 84b6a37d3f..2033f4cf0d 100644 --- 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 a19b46bd44..8857da9f82 100644 --- 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 6302955d10..e090291358 100644 --- 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"