From c412f1358edc66cd3a162d8e9a0b88f401ca671b Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 25 Oct 2013 14:13:20 +0000 Subject: [PATCH] CMake: Code cleanup and resolve cache invalidation problem git-svn-id: https://svn.dealii.org/trunk@31423 0785d39b-7218-0410-832d-ea1e28bc413d --- ...nfigure_1_umfpack.cmake => configure_2_umfpack.cmake} | 0 deal.II/cmake/modules/FindARPACK.cmake | 5 ----- deal.II/cmake/modules/FindMUMPS.cmake | 1 - deal.II/cmake/modules/FindSCALAPACK.cmake | 6 ------ deal.II/cmake/modules/FindUMFPACK.cmake | 9 --------- 5 files changed, 21 deletions(-) rename deal.II/cmake/configure/{configure_1_umfpack.cmake => configure_2_umfpack.cmake} (100%) 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 f2bb51d628..7e8da72090 100644 --- 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 6099238908..d3ae910fe7 100644 --- 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 96a6a539b3..19af21abf8 100644 --- 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 8f5ed61440..71f9361e1a 100644 --- 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: # -- 2.39.5