From: maier Date: Fri, 28 Sep 2012 12:15:16 +0000 (+0000) Subject: Reorganization of configure_ scripts #1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29a46081a64a601246b17064ea9cf1cca77cbcc3;p=dealii-svn.git Reorganization of configure_ scripts #1 git-svn-id: https://svn.dealii.org/branches/branch_cmake@26826 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index ecae7d299b..b06ff1cab4 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -50,10 +50,6 @@ OPTION(DEAL_II_WITH_ARPACK "Build deal.II with support for ARPACK." OFF) -OPTION(DEAL_II_WITH_BLAS - "Build deal.II with support for BLAS." - OFF) - SET(DEAL_II_WITH_BOOST # Always true. We need it :-] ON diff --git a/deal.II/cmake/configure/configure_lapack.cmake b/deal.II/cmake/configure/configure_lapack.cmake index cdd97b17fe..5cbe0a8136 100644 --- a/deal.II/cmake/configure/configure_lapack.cmake +++ b/deal.II/cmake/configure/configure_lapack.cmake @@ -3,6 +3,7 @@ # Configuration for the lapack library: # + MACRO(FEATURE_LAPACK_FIND_EXTERNAL var) FIND_PACKAGE(LAPACK) diff --git a/deal.II/cmake/configure/configure_umfpack.cmake b/deal.II/cmake/configure/configure_umfpack.cmake index 9a7380347b..6eecc3f3d5 100644 --- a/deal.II/cmake/configure/configure_umfpack.cmake +++ b/deal.II/cmake/configure/configure_umfpack.cmake @@ -4,7 +4,9 @@ SET(FEATURE_UMFPACK_DEPENDS - DEAL_II_WITH_BLAS + # + # Currently, with enabled umfpack support, we also need LAPACK... + # DEAL_II_WITH_LAPACK )