From: maier Date: Thu, 4 Oct 2012 14:29:42 +0000 (+0000) Subject: Update Documentation and error messages X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b119ddba6af6d43f2f41f8e5bb50104f358f3a20;p=dealii-svn.git Update Documentation and error messages git-svn-id: https://svn.dealii.org/branches/branch_cmake@26952 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/README.CMAKE b/deal.II/README.CMAKE index 46979ef64e..73da0621e0 100644 --- a/deal.II/README.CMAKE +++ b/deal.II/README.CMAKE @@ -267,10 +267,11 @@ CONFIGURATION Currently, the following variables will be considered: METIS_DIR, + MUMPS_DIR (and SCALAPACK_DIR), P4EST_DIR (and SC_DIR), PETSC_DIR and PETSC_ARCH (forming ${PETSC_DIR}/${PETSC_ARCH}), TRILINOS_DIR, - UMFPACK_DIR (and AMD_DIR) + UMFPACK_DIR (and AMD_DIR, SUITESPARSECONFIG_DIR) 3.) The system default locations for libraries and includes. diff --git a/deal.II/cmake/configure/configure_mumps.cmake b/deal.II/cmake/configure/configure_mumps.cmake index 4fd8fd7859..82254c9cb6 100644 --- a/deal.II/cmake/configure/configure_mumps.cmake +++ b/deal.II/cmake/configure/configure_mumps.cmake @@ -44,5 +44,22 @@ MACRO(FEATURE_MUMPS_CONFIGURE_EXTERNAL var) ENDMACRO() +SET(FEATURE_MUMPS_CUSTOM_ERROR_MESSAGE TRUE) + + +MACRO(FEATURE_MUMPS_ERROR_MESSAGE) + MESSAGE(SEND_ERROR "\n" + "Could not find the mumps library!\n" + "Please ensure that the library is installed on your computer.\n" + "If the libraries is not at a default location, either provide some hints\n" + "for the autodetection:\n" + " $ MUMPS_DIR=\"...\" cmake <...>\n" + " $ ccmake -DMUMPS_DIR=\"...\" cmake <...>\n" + "or set the relevant variables by hand in ccmake.\n" + "Relevant hints for MUMPS are MUMPS_DIR and SCALAPACK_DIR.\n\n" + ) +ENDMACRO() + + CONFIGURE_FEATURE(MUMPS) diff --git a/deal.II/cmake/configure/configure_umfpack.cmake b/deal.II/cmake/configure/configure_umfpack.cmake index 719aebb166..fcf594b8b9 100644 --- a/deal.II/cmake/configure/configure_umfpack.cmake +++ b/deal.II/cmake/configure/configure_umfpack.cmake @@ -70,8 +70,10 @@ MACRO(FEATURE_UMFPACK_ERROR_MESSAGE) " $ UMFPACK_DIR=\"...\" cmake <...>\n" " $ ccmake -DUMFPACK_DIR=\"...\" cmake <...>\n" "or set the relevant variables by hand in ccmake.\n" + "Relevant hints for UMFPACK are UMFPACK_DIR, AMD_DIR, SUITESPARSECONFIG_DIR.\n" "Alternatively you may choose to compile the bundled libraries\n" - "by setting DEAL_II_ALLOW_BUNDLED=ON or DEAL_II_FORCE_BUNDLED_UMFPACK=ON.\n\n" + "by setting DEAL_II_ALLOW_BUNDLED=ON or DEAL_II_FORCE_BUNDLED_UMFPACK=ON.\n" + "(BLAS has to be installed for bundled UMFPACK to be available)\n\n" ) ENDMACRO() diff --git a/deal.II/cmake/modules/FindMUMPS.cmake b/deal.II/cmake/modules/FindMUMPS.cmake index c348f60772..9be2efd77d 100644 --- a/deal.II/cmake/modules/FindMUMPS.cmake +++ b/deal.II/cmake/modules/FindMUMPS.cmake @@ -33,6 +33,8 @@ INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE(SCALAPACK) # which will also include lapack and blas # +# TODO: mumps might link to scotch and or metis as well. Ignore this for +# now. :-] # TODO: libpord.a ? # diff --git a/deal.II/cmake/modules/FindSCALAPACK.cmake b/deal.II/cmake/modules/FindSCALAPACK.cmake index 0b16faf660..1dd003492b 100644 --- a/deal.II/cmake/modules/FindSCALAPACK.cmake +++ b/deal.II/cmake/modules/FindSCALAPACK.cmake @@ -32,7 +32,7 @@ INCLUDE(FindPackageHandleStandardArgs) # SCALAPACK needs LAPACK and BLAS as dependency, search for them with the help # of the LAPACK find module: # -# TODO: SCALAPACK and mpi... +# TODO: ScaLAPACK and mpi... # FIND_PACKAGE(LAPACK) @@ -58,7 +58,7 @@ SET(SCALAPACK_LINKER_FLAGS # probabilistic way... # FIND_LIBRARY(BLACS_LIBRARY - NAMES blacs + NAMES blacs # TODO ${BLACS_DIR} ${SCALAPACK_DIR} ${SCALAPACK_DIR}/../blacs/