From: maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 1 Mar 2013 22:57:42 +0000 (+0000)
Subject: Bugfixes
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f755396d903f7859717eaaf0157925dc463d54b;p=dealii-svn.git

Bugfixes

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

diff --git a/deal.II/cmake/configure/configure_lapack.cmake b/deal.II/cmake/configure/configure_1_lapack.cmake
similarity index 100%
rename from deal.II/cmake/configure/configure_lapack.cmake
rename to deal.II/cmake/configure/configure_1_lapack.cmake
diff --git a/deal.II/cmake/configure/configure_arpack.cmake b/deal.II/cmake/configure/configure_arpack.cmake
index 869e508460..f592a4d1eb 100644
--- a/deal.II/cmake/configure/configure_arpack.cmake
+++ b/deal.II/cmake/configure/configure_arpack.cmake
@@ -16,4 +16,6 @@
 # Configuration for the ARPACK library:
 #
 
+SET(FEATURE_UMFPACK_DEPENDS DEAL_II_WITH_LAPACK)
+
 CONFIGURE_FEATURE(ARPACK)
diff --git a/deal.II/cmake/configure/configure_mumps.cmake b/deal.II/cmake/configure/configure_mumps.cmake
index 623c571d94..6714e395c5 100644
--- a/deal.II/cmake/configure/configure_mumps.cmake
+++ b/deal.II/cmake/configure/configure_mumps.cmake
@@ -16,6 +16,6 @@
 # Configuration for the MUMPS library:
 #
 
-SET(FEATURE_MUMPS_DEPENDS DEAL_II_WITH_MPI)
+SET(FEATURE_MUMPS_DEPENDS DEAL_II_WITH_MPI DEAL_II_WITH_LAPACK)
 
 CONFIGURE_FEATURE(MUMPS)
diff --git a/deal.II/cmake/configure/configure_umfpack.cmake b/deal.II/cmake/configure/configure_umfpack.cmake
index f3de32386e..0d8ebde0d4 100644
--- a/deal.II/cmake/configure/configure_umfpack.cmake
+++ b/deal.II/cmake/configure/configure_umfpack.cmake
@@ -16,10 +16,6 @@
 # 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_CONFIGURE_BUNDLED)
diff --git a/deal.II/cmake/macros/macro_find_package.cmake b/deal.II/cmake/macros/macro_find_package.cmake
index 8aad849e93..8f6b623f40 100644
--- a/deal.II/cmake/macros/macro_find_package.cmake
+++ b/deal.II/cmake/macros/macro_find_package.cmake
@@ -21,7 +21,7 @@
 MACRO(FIND_PACKAGE _package_name)
   STRING(TOUPPER ${_package_name} _package_name_uppercase)
 
-  IF(NOT ${_package_name_uppercase}_FOUND)
+  IF(NOT DEFINED ${_package_name_uppercase}_FOUND)
     _FIND_PACKAGE (${_package_name} ${ARGN})
   ENDIF()
 ENDMACRO()