From 0bc96be5094969b508136ceaa0eb667d60b83b39 Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 11 Jul 2013 17:44:30 +0000 Subject: [PATCH] CMake: Cleanup git-svn-id: https://svn.dealii.org/trunk@29975 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/modules/FindARPACK.cmake | 3 ++- deal.II/cmake/modules/FindHDF5.cmake | 7 ++++--- deal.II/cmake/modules/FindMETIS.cmake | 4 ++-- deal.II/cmake/modules/FindMUMPS.cmake | 8 +++----- deal.II/cmake/modules/FindP4EST.cmake | 1 + deal.II/cmake/modules/FindSCALAPACK.cmake | 1 + 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/deal.II/cmake/modules/FindARPACK.cmake b/deal.II/cmake/modules/FindARPACK.cmake index a57f307961..47e75d3cf9 100644 --- a/deal.II/cmake/modules/FindARPACK.cmake +++ b/deal.II/cmake/modules/FindARPACK.cmake @@ -48,7 +48,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(ARPACK DEFAULT_MSG IF(ARPACK_FOUND) SET(ARPACK_LIBRARIES - ${ARPACK_LIBRARY} ${LAPACK_LIBRARIES} + ${ARPACK_LIBRARY} + ${LAPACK_LIBRARIES} ) SET(ARPACK_LINKER_FLAGS ${LAPACK_LINKER_FLAGS} diff --git a/deal.II/cmake/modules/FindHDF5.cmake b/deal.II/cmake/modules/FindHDF5.cmake index 12675f7ed2..c5006ca792 100644 --- a/deal.II/cmake/modules/FindHDF5.cmake +++ b/deal.II/cmake/modules/FindHDF5.cmake @@ -47,11 +47,11 @@ FIND_LIBRARY(HDF5_HL_LIBRARY NAMES hdf5_hl lib${LIB_SUFFIX} lib64 lib ) -SET(_output ${HDF5_LIBRARY} ${HDF5_HL_LIBRARY}) +SET(_output ${HDF5_HL_LIBRARY} ${HDF5_LIBRARY}) FIND_PACKAGE_HANDLE_STANDARD_ARGS(HDF5 DEFAULT_MSG _output # Cosmetic: Gives nice output - HDF5_LIBRARY HDF5_HL_LIBRARY + HDF5_LIBRARY HDF5_INCLUDE_DIR ) @@ -60,8 +60,9 @@ IF(HDF5_FOUND) ${HDF5_INCLUDE_DIR} ) SET(HDF5_LIBRARIES - ${HDF5_LIBRARY} ${HDF5_HL_LIBRARY} + ${HDF5_LIBRARY} + ${MPI_C_LIBRARIES} # for good measure ) # diff --git a/deal.II/cmake/modules/FindMETIS.cmake b/deal.II/cmake/modules/FindMETIS.cmake index be83ff3e89..c6a5949ea5 100644 --- a/deal.II/cmake/modules/FindMETIS.cmake +++ b/deal.II/cmake/modules/FindMETIS.cmake @@ -27,9 +27,9 @@ SET_IF_EMPTY(METIS_DIR "$ENV{METIS_DIR}") # # Metis is usually pretty self contained. So no external dependencies -# so far... But there could be dependencies on pcre and mpi... +# so far. But there could be dependencies on pcre and mpi... # -# Link in MPI unconditionally (if found) +# Link in MPI unconditionally (if found). # FIND_PATH(METIS_INCLUDE_DIR metis.h diff --git a/deal.II/cmake/modules/FindMUMPS.cmake b/deal.II/cmake/modules/FindMUMPS.cmake index 22ee16a703..0a9d9a7fe0 100644 --- a/deal.II/cmake/modules/FindMUMPS.cmake +++ b/deal.II/cmake/modules/FindMUMPS.cmake @@ -31,11 +31,8 @@ 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) -# -# TODO: mumps might link to scotch and or metis as well. Ignore this for -# now. :-] -# FIND_PATH(MUMPS_INCLUDE_DIR dmumps_c.h HINTS @@ -91,7 +88,8 @@ IF(MUMPS_FOUND) ${MUMPS_COMMON_LIBRARY} ${PORD_LIBRARY} ${SCALAPACK_LIBRARIES} - ${MPI_Fortran_LIBRARIES} # For good measure + ${METIS_LIBRARIES} # for good measure + ${MPI_Fortran_LIBRARIES} # for good measure ) SET(MUMPS_LINKER_FLAGS ${SCALAPACK_LINKER_FLAGS} diff --git a/deal.II/cmake/modules/FindP4EST.cmake b/deal.II/cmake/modules/FindP4EST.cmake index 3aad02abdf..1ea765df01 100644 --- a/deal.II/cmake/modules/FindP4EST.cmake +++ b/deal.II/cmake/modules/FindP4EST.cmake @@ -82,6 +82,7 @@ FIND_LIBRARY(SC_LIBRARY SET(_output ${P4EST_LIBRARY} ${SC_LIBRARY}) FIND_PACKAGE_HANDLE_STANDARD_ARGS(P4EST DEFAULT_MSG + _output # Cosmetic: Gives nice output P4EST_LIBRARY SC_LIBRARY P4EST_INCLUDE_DIR diff --git a/deal.II/cmake/modules/FindSCALAPACK.cmake b/deal.II/cmake/modules/FindSCALAPACK.cmake index 5b06ce3233..16a1d13cd6 100644 --- a/deal.II/cmake/modules/FindSCALAPACK.cmake +++ b/deal.II/cmake/modules/FindSCALAPACK.cmake @@ -76,6 +76,7 @@ IF(SCALAPACK_FOUND) ${SCALAPACK_LIBRARY} ${LAPACK_LIBRARIES} ${BLACS_LIBRARIES} + ${MPI_Fortran_LIBRARIES} # for good measure ) SET(SCALAPACK_LINKER_FLAGS ${LAPACK_LINKER_FLAGS} -- 2.39.5