CMake: Code cleanup and resolve cache invalidation problem

git-svn-id: https://svn.dealii.org/trunk@31423 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/configure/configure_1_umfpack.cmake b/deal.II/cmake/configure/configure_2_umfpack.cmake
similarity index 100%
rename from deal.II/cmake/configure/configure_1_umfpack.cmake
rename to deal.II/cmake/configure/configure_2_umfpack.cmake

diff --git a/deal.II/cmake/modules/FindARPACK.cmake b/deal.II/cmake/modules/FindARPACK.cmake
index f2bb51d628a4bbc322c9c9afe29a207f2c0f3b39..7e8da720905a151e4119b078cd22700671beca18 100644 (file)
--- a/deal.II/cmake/modules/FindARPACK.cmake
+++ b/deal.II/cmake/modules/FindARPACK.cmake
@@ -31,11 +31,6 @@ INCLUDE(FindPackageHandleStandardArgs)
 
 SET_IF_EMPTY(ARPACK_DIR "$ENV{ARPACK_DIR}")
 
-#
-# ARPACK needs LAPACK and BLAS as dependencies:
-#
-FIND_PACKAGE(DEALII_LAPACK)
-
 FIND_LIBRARY(ARPACK_LIBRARY
   NAMES arpack
   HINTS

diff --git a/deal.II/cmake/modules/FindMUMPS.cmake b/deal.II/cmake/modules/FindMUMPS.cmake
index 6099238908291c6b1d24ffb5e3e721f47c0cd521..d3ae910fe7a08836e7db44f3862e67802ee5f7d3 100644 (file)
--- a/deal.II/cmake/modules/FindMUMPS.cmake
+++ b/deal.II/cmake/modules/FindMUMPS.cmake
@@ -37,7 +37,6 @@ INCLUDE(FindPackageHandleStandardArgs)
 # (We'll rely on the user of FindMUMPS, setting up mpi *cough*)
 #
 FIND_PACKAGE(SCALAPACK) # which will also include lapack and blas
-FIND_PACKAGE(METIS)
 
 
 FIND_PATH(MUMPS_INCLUDE_DIR dmumps_c.h

diff --git a/deal.II/cmake/modules/FindSCALAPACK.cmake b/deal.II/cmake/modules/FindSCALAPACK.cmake
index 96a6a539b36f3305282de73209bada6e94086ff2..19af21abf852eb9e8a96ca9d256f2687ed3bcb63 100644 (file)
--- a/deal.II/cmake/modules/FindSCALAPACK.cmake
+++ b/deal.II/cmake/modules/FindSCALAPACK.cmake
@@ -37,12 +37,6 @@ FIND_LIBRARY(SCALAPACK_LIBRARY NAMES scalapack
     lib${LIB_SUFFIX} lib64 lib
   )
 
-#
-# SCALAPACK needs LAPACK and BLAS as dependency, search for them with the help
-# of the LAPACK find module:
-#
-FIND_PACKAGE(DEALII_LAPACK)
-
 #
 # Well, depending on the version of scalapack and the distribution it might
 # be necessary to search for blacs, too. So we do this in a very

diff --git a/deal.II/cmake/modules/FindUMFPACK.cmake b/deal.II/cmake/modules/FindUMFPACK.cmake
index 8f5ed61440fbdcfd74a41997bbc0fbc0d436c9a3..71f9361e1ad0245ed135e38d759eda0a456b3918 100644 (file)
--- a/deal.II/cmake/modules/FindUMFPACK.cmake
+++ b/deal.II/cmake/modules/FindUMFPACK.cmake
@@ -34,15 +34,6 @@ FOREACH(_comp SUITESPARSE SUITESPARSE_CONFIG UMFPACK AMD CHOLMOD COLAMD)
   SET_IF_EMPTY(${_comp}_DIR "$ENV{${_comp}_DIR}")
 ENDFOREACH()
 
-
-#
-# UMFPACK depends on BLAS and LAPACK, so search for them:
-# TODO: There might be an external dependency for metis, ignore this for
-# now.
-#
-FIND_PACKAGE(DEALII_LAPACK)
-FIND_PACKAGE(METIS)
-
 #
 # Two macros to make life easier:
 #