From 423f88aa1e764586cd7f643ccc13f5bafe99fda6 Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Wed, 6 Oct 2010 17:38:02 +0200
Subject: [PATCH] improve FindCholmod

---
 cmake/FindCholmod.cmake | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/cmake/FindCholmod.cmake b/cmake/FindCholmod.cmake
index 444279ab9..908926d0b 100644
--- a/cmake/FindCholmod.cmake
+++ b/cmake/FindCholmod.cmake
@@ -22,9 +22,9 @@ if(CHOLMOD_LIBRARIES)
   find_library(AMD_LIBRARY amd PATHS ${CHOLMOD_LIBDIR} $ENV{CHOLMODDIR} ${LIB_INSTALL_DIR})
   if (AMD_LIBRARY)
     set(CHOLMOD_LIBRARIES ${CHOLMOD_LIBRARIES} ${AMD_LIBRARY})
-  else (AMD_LIBRARY)
+  else ()
     set(CHOLMOD_LIBRARIES FALSE)
-  endif (AMD_LIBRARY)
+  endif ()
 
 endif(CHOLMOD_LIBRARIES)
 
@@ -33,9 +33,9 @@ if(CHOLMOD_LIBRARIES)
   find_library(COLAMD_LIBRARY colamd PATHS ${CHOLMOD_LIBDIR} $ENV{CHOLMODDIR} ${LIB_INSTALL_DIR})
   if (COLAMD_LIBRARY)
     set(CHOLMOD_LIBRARIES ${CHOLMOD_LIBRARIES} ${COLAMD_LIBRARY})
-  else (COLAMD_LIBRARY)
+  else ()
     set(CHOLMOD_LIBRARIES FALSE)
-  endif (COLAMD_LIBRARY)
+  endif ()
 
 endif(CHOLMOD_LIBRARIES)
 
@@ -44,20 +44,29 @@ if(CHOLMOD_LIBRARIES)
   find_library(CAMD_LIBRARY camd PATHS ${CHOLMOD_LIBDIR} $ENV{CHOLMODDIR} ${LIB_INSTALL_DIR})
   if (CAMD_LIBRARY)
     set(CHOLMOD_LIBRARIES ${CHOLMOD_LIBRARIES} ${CAMD_LIBRARY})
-  else (CAMD_LIBRARY)
+  else ()
     set(CHOLMOD_LIBRARIES FALSE)
-  endif (CAMD_LIBRARY)
+  endif ()
 
 endif(CHOLMOD_LIBRARIES)
 
 if(CHOLMOD_LIBRARIES)
 
-  find_library(CCOLAMD_LIBRARY colamd PATHS ${CHOLMOD_LIBDIR} $ENV{CHOLMODDIR} ${LIB_INSTALL_DIR})
+  find_library(CCOLAMD_LIBRARY ccolamd PATHS ${CHOLMOD_LIBDIR} $ENV{CHOLMODDIR} ${LIB_INSTALL_DIR})
   if (CCOLAMD_LIBRARY)
     set(CHOLMOD_LIBRARIES ${CHOLMOD_LIBRARIES} ${CCOLAMD_LIBRARY})
-  else (CCOLAMD_LIBRARY)
+  else ()
     set(CHOLMOD_LIBRARIES FALSE)
-  endif (CCOLAMD_LIBRARY)
+  endif ()
+
+endif(CHOLMOD_LIBRARIES)
+
+if(CHOLMOD_LIBRARIES)
+
+  find_library(CHOLMOD_METIS_LIBRARY metis PATHS ${CHOLMOD_LIBDIR} $ENV{CHOLMODDIR} ${LIB_INSTALL_DIR})
+  if (CHOLMOD_METIS_LIBRARY)
+    set(CHOLMOD_LIBRARIES ${CHOLMOD_LIBRARIES} ${CHOLMOD_METIS_LIBRARY})
+  endif ()
 
 endif(CHOLMOD_LIBRARIES)