]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix: Revert broken idea
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 5 Oct 2012 17:40:07 +0000 (17:40 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 5 Oct 2012 17:40:07 +0000 (17:40 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26974 0785d39b-7218-0410-832d-ea1e28bc413d

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

index b80033cf9dc16cecff75bd3f9e3b19a1c08ad87b..39eefaf515ecbffacefc6dee3c32c3704c816ae1 100644 (file)
@@ -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)
index 9ea8c231bc70fc1ca2d22624f8db243c9038c3dd..68d114ae70a1c84b612f1ea5642797149eff21f0 100644 (file)
 #####
 
 #
-# 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)

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.