From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Thu, 11 Jul 2013 16:44:05 +0000 (+0000)
Subject: CMake: OK, third try
X-Git-Tag: v8.0.0~148
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a89d699af4120514d91bb9d0751826fa4d66deb7;p=dealii.git

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 85ea382b74..a8cb4a4871 100644
--- 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