]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Add configuration dependencies for umfpack
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 14 Sep 2012 20:25:15 +0000 (20:25 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 14 Sep 2012 20:25:15 +0000 (20:25 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26391 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/contrib/cmake/configure/configure_umfpack.cmake

index bb4a4b6afe1ec8d8f55fd13729d7f411e768a1eb..c22584aab863bc88fbc61994f764fc2a1fbbf738 100644 (file)
@@ -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."
index 2221076322c01b4e459e01637a541bd123fc59c5..26145cefbab075ec8591c3a9cd37f9cd0e702019 100644 (file)
@@ -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()

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.