From 3d98bd5415767655065877bb2a30fe1cb6ad8b11 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 11 Jul 2013 16:22:58 +0000 Subject: [PATCH] CMake: Fix up some remaining link interfaces git-svn-id: https://svn.dealii.org/trunk@29972 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/modules/FindMETIS.cmake | 5 ++++- deal.II/cmake/modules/FindUMFPACK.cmake | 18 +++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/deal.II/cmake/modules/FindMETIS.cmake b/deal.II/cmake/modules/FindMETIS.cmake index b0a92789ee..8829c8b06b 100644 --- a/deal.II/cmake/modules/FindMETIS.cmake +++ b/deal.II/cmake/modules/FindMETIS.cmake @@ -53,7 +53,10 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(METIS DEFAULT_MSG ) IF(METIS_FOUND) - SET(METIS_LIBRARIES ${METIS_LIBRARY}) + SET(METIS_LIBRARIES + ${METIS_LIBRARY} + ${MPI_CXX_LIBRARIES} # for good measure + ) SET(METIS_INCLUDE_DIRS ${METIS_INCLUDE_DIR}) # diff --git a/deal.II/cmake/modules/FindUMFPACK.cmake b/deal.II/cmake/modules/FindUMFPACK.cmake index 029e8708db..85ea382b74 100644 --- a/deal.II/cmake/modules/FindUMFPACK.cmake +++ b/deal.II/cmake/modules/FindUMFPACK.cmake @@ -103,9 +103,10 @@ FIND_UMFPACK_LIBRARY(UMFPACK umfpack REQUIRED) FIND_UMFPACK_LIBRARY(AMD amd REQUIRED) FIND_UMFPACK_LIBRARY(CHOLMOD cholmod) FIND_UMFPACK_LIBRARY(COLAMD colamd) +FIND_UMFPACK_LIBRARY(CAMD camd) FIND_UMFPACK_LIBRARY(SuiteSparse_config suitesparseconfig) -SET(_output ${UMFPACK_LIBRARY} ${CHOLMOD_LIBRARY} ${COLAMD_LIBRARY} ${AMD_LIBRARY} ${SuiteSparse_config_LIBRARY}) +SET(_output ${UMFPACK_LIBRARY} ${CHOLMOD_LIBRARY} ${COLAMD_LIBRARY} ${CAMD_LIBRARY} ${AMD_LIBRARY} ${SuiteSparse_config_LIBRARY}) FIND_PACKAGE_HANDLE_STANDARD_ARGS(UMFPACK DEFAULT_MSG _output # Cosmetic: Gives nice output UMFPACK_LIBRARY @@ -122,8 +123,10 @@ IF(UMFPACK_FOUND) ${UMFPACK_LIBRARY} ${CHOLMOD_LIBRARY} ${COLAMD_LIBRARY} + ${CAMD_LIBRARY} ${AMD_LIBRARY} ${SuiteSparse_config_LIBRARY} + ${METIS_LIBRARIES} # for good measure ${LAPACK_LIBRARIES} ) @@ -149,18 +152,19 @@ IF(UMFPACK_FOUND) ) MARK_AS_ADVANCED( + AMD_INCLUDE_DIR + AMD_LIBRARY atlas_LIBRARY blas_LIBRARY - UMFPACK_LIBRARY - AMD_LIBRARY + CAMD_LIBRARY CHOLMOD_LIBRARY COLAMD_LIBRARY - SuiteSparse_config_LIBRARY - UMFPACK_INCLUDE_DIR - AMD_INCLUDE_DIR SuiteSparse_config_INCLUDE_DIR - UMFPACK_DIR + SuiteSparse_config_LIBRARY SUITESPARSE_DIR + UMFPACK_DIR + UMFPACK_INCLUDE_DIR + UMFPACK_LIBRARY ) ELSE() SET(UMFPACK_DIR "" CACHE PATH -- 2.39.5