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 869e5084608766a646818d378b5ebaa491fe23cb..f592a4d1eb09c57596de8183c0e175a4dfe0017c 100644 (file)
--- 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 623c571d94e7e2d31d6e6ed93f869d734ba012a6..6714e395c5a731fac66bc5bb08c273402366a324 100644 (file)
--- 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 f3de32386eaf3ae45904b95cf4319e901e55bd97..0d8ebde0d4cde4cf3b36091d65b93f6da9cc6e68 100644 (file)
--- 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 8aad849e9338f6820ac2607197a8061d3b81f16f..8f6b623f4033e8e5cd8c272feee8adbe20097548 100644 (file)
--- 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()