CMake: OK, third try

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

diff --git a/deal.II/cmake/modules/FindUMFPACK.cmake b/deal.II/cmake/modules/FindUMFPACK.cmake
index 85ea382b74c31df3651811fe24b1da4f3400dfe9..a8cb4a487153325f1e2cecb5ba3916e2aa374368 100644 (file)
--- a/deal.II/cmake/modules/FindUMFPACK.cmake
+++ b/deal.II/cmake/modules/FindUMFPACK.cmake
@@ -103,10 +103,11 @@ 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(CCOLAMD ccolamd)
 FIND_UMFPACK_LIBRARY(CAMD camd)
 FIND_UMFPACK_LIBRARY(SuiteSparse_config suitesparseconfig)
 
-SET(_output ${UMFPACK_LIBRARY} ${CHOLMOD_LIBRARY} ${COLAMD_LIBRARY} ${CAMD_LIBRARY} ${AMD_LIBRARY} ${SuiteSparse_config_LIBRARY})
+SET(_output ${UMFPACK_LIBRARY} ${CHOLMOD_LIBRARY} ${CCOLAMD_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,6 +123,7 @@ IF(UMFPACK_FOUND)
   SET(UMFPACK_LIBRARIES
     ${UMFPACK_LIBRARY}
     ${CHOLMOD_LIBRARY}
+    ${CCOLAMD_LIBRARY}
     ${COLAMD_LIBRARY}
     ${CAMD_LIBRARY}
     ${AMD_LIBRARY}
@@ -158,6 +160,7 @@ IF(UMFPACK_FOUND)
     blas_LIBRARY
     CAMD_LIBRARY
     CHOLMOD_LIBRARY
+    CCOLAMD_LIBRARY
     COLAMD_LIBRARY
     SuiteSparse_config_INCLUDE_DIR
     SuiteSparse_config_LIBRARY