From 3505d09299c956a0cee594f9b30f945e15e9ab72 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 14 Sep 2012 20:25:15 +0000 Subject: [PATCH] Add configuration dependencies for umfpack git-svn-id: https://svn.dealii.org/branches/branch_cmake@26391 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CMakeLists.txt | 6 +++--- .../cmake/configure/configure_umfpack.cmake | 20 ++++++++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index bb4a4b6afe..c22584aab8 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -84,7 +84,7 @@ OPTION(DEAL_II_FEATURE_AUTODETECTION "Enables feature autodetection. This will automatically overwrite all DEAL_II_WITH_<...> toggles depending on whether they can be supported or not." - ON) + OFF) OPTION(DEAL_II_WITH_BLAS "Build deal.II with support for BLAS." @@ -96,7 +96,7 @@ OPTION(DEAL_II_WITH_FUNCTIONPARSER OPTION(DEAL_II_WITH_LAPACK "Build deal.II with support for LAPACK." - OFF) + ON) OPTION(DEAL_II_WITH_METIS "Build deal.II with support for Metis." @@ -116,7 +116,7 @@ OPTION(DEAL_II_WITH_TBB OPTION(DEAL_II_WITH_UMFPACK "Build deal.II with support for UMFPACK." - OFF) + ON) OPTION(DEAL_II_WITH_ZLIB "Build deal.II with support for zlib." diff --git a/deal.II/contrib/cmake/configure/configure_umfpack.cmake b/deal.II/contrib/cmake/configure/configure_umfpack.cmake index 2221076322..26145cefba 100644 --- a/deal.II/contrib/cmake/configure/configure_umfpack.cmake +++ b/deal.II/contrib/cmake/configure/configure_umfpack.cmake @@ -2,7 +2,6 @@ # Configuration for the umfpack and amd libraries: # -# TODO: Implement the dependency on BLAS and LAPACK MACRO(FIND_FEATURE_UMFPACK_EXTERNAL var) @@ -78,5 +77,20 @@ by setting DEAL_II_ALLOW_CONTRIB=on or DEAL_II_FORCE_CONTRIB_UMFPACK=on. ") ENDMACRO() - -CONFIGURE_FEATURE(UMFPACK) +# +# UMFPACK needs BLAS and LAPACK to be configured: +# +IF(DEAL_II_WITH_BLAS AND DEAL_II_WITH_LAPACK) + CONFIGURE_FEATURE(UMFPACK) +ELSE() + IF(DEAL_II_FEATURE_AUTODETECT) + MESSAGE(STATUS + "DEAL_II_WITH_UMFPACK has unmet configuration requirements: Both, DEAL_II_WITH_BLAS and DEAL_II_WITH_LAPACK have to be set." + ) + SET_CACHED_OPTION(DEAL_II_WITH_UMFPACK OFF) + ELSE() + MESSAGE(SEND_ERROR + "DEAL_II_WITH_UMFPACK has unmet configuration requirements: Both, DEAL_II_WITH_BLAS and DEAL_II_WITH_LAPACK have to be set." + ) + ENDIF() +ENDIF() -- 2.39.5