From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Fri, 5 Oct 2012 17:40:07 +0000 (+0000)
Subject: Bugfix: Revert broken idea
X-Git-Tag: v8.0.0~1079^2~484
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f050759e1ebe714137945402264b33a3156125d;p=dealii.git

Bugfix: Revert broken idea

git-svn-id: https://svn.dealii.org/branches/branch_cmake@26974 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/bundled/CMakeLists.txt b/deal.II/bundled/CMakeLists.txt
index b80033cf9d..39eefaf515 100644
--- a/deal.II/bundled/CMakeLists.txt
+++ b/deal.II/bundled/CMakeLists.txt
@@ -82,31 +82,15 @@ ENDIF()
 # UMFPACK, AMD and UFCONFIG:
 #
 
-#
-# We need BLAS as an external dependency. So only define the bundled
-# umfpack library as usable if we actually have blas available...
-# TODO: Cleanup this hack.
-#
-IF(NOT FEATURE_UMFPACK_HAVE_BUNDLED)
-  FIND_PACKAGE(BLAS)
-ENDIF()
-
-IF(BLAS_FOUND)
-  SET(FEATURE_UMFPACK_HAVE_BUNDLED TRUE)
-  SET(UMFPACK_FOLDER "${CMAKE_SOURCE_DIR}/bundled/umfpack")
-  OPTION(DEAL_II_FORCE_BUNDLED_UMFPACK
-    "Always use the bundled umfpack library instead of an external one."
-    OFF)
-  MARK_AS_ADVANCED(
-    atlas_LIBRARY
-    blas_LIBRARY
-    )
-ELSE()
-  MESSAGE(WARNING "\n"
-    "Could not find the BLAS library: "
-    "Disabling bundled UMFPACK\n\n"
-    )
-ENDIF()
+SET(FEATURE_UMFPACK_HAVE_BUNDLED TRUE)
+SET(UMFPACK_FOLDER "${CMAKE_SOURCE_DIR}/bundled/umfpack")
+OPTION(DEAL_II_FORCE_BUNDLED_UMFPACK
+  "Always use the bundled umfpack library instead of an external one."
+  OFF)
+MARK_AS_ADVANCED(
+  atlas_LIBRARY
+  blas_LIBRARY
+  )
 
 IF(FEATURE_UMFPACK_BUNDLED_CONFIGURED)
   ADD_SUBDIRECTORY(${UMFPACK_FOLDER}/UMFPACK/Source)
diff --git a/deal.II/cmake/configure/configure_umfpack.cmake b/deal.II/cmake/configure/configure_umfpack.cmake
index 9ea8c231bc..68d114ae70 100644
--- a/deal.II/cmake/configure/configure_umfpack.cmake
+++ b/deal.II/cmake/configure/configure_umfpack.cmake
@@ -13,9 +13,15 @@
 #####
 
 #
-# Configuration for the umfpack and amd libraries:
+# Configuration for the umfpack library:
 #
 
+#
+# We depend on LAPACK to have a sane BLAS/LAPACK installation for bundled
+# packages...
+#
+SET(FEATURE_UMFPACK_DEPENDS DEAL_II_WITH_LAPACK)
+
 
 MACRO(FEATURE_UMFPACK_FIND_EXTERNAL var)
   FIND_PACKAGE(UMFPACK)