Merge branch 'update_finders' into 'master'

Update IPOPT related finders

See merge request !167

cmake/FindIPOPT.cmake

@@ -87,8 +87,8 @@ if (WIN32)
 
 ELSE( WIN32 )
    find_path(IPOPT_INCLUDE_DIR NAMES IpNLP.hpp
-     PATHS  "$ENV{IPOPT_HOME}/include/coin"
-            "/usr/include/coin"
+     HINTS  "$ENV{IPOPT_HOME}/include/coin"
+     PATHS  "/usr/include/coin"
             "~/sw/Ipopt-3.12.4-installed/include/coin"
    )
 

cmake/FindMETIS.cmake

@@ -36,30 +36,31 @@ endif()
 
 
 find_path(METIS_INCLUDE_DIR NAMES metis.h
-     PATHS "$ENV{IPOPT_HOME}/ThirdParty/Metis/metis-4.0/Lib/"
-           "/usr/include/"
+     HINTS "$ENV{IPOPT_HOME}/ThirdParty/Metis/metis-4.0/Lib/"
+           "$ENV{IPOPT_HOME}/include/coin/ThirdParty/"
+     PATHS "/usr/include/"
            "/usr/include/metis"
            "/opt/local/include"
            "/opt/local/include/metis"
-		   "${VS_SEARCH_PATH}Ipopt-3.12.9/include/metis"
+           "${VS_SEARCH_PATH}Ipopt-3.12.9/include/metis"
            "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/include/metis"
    )
    
 find_library( METIS_LIBRARY_RELEASE
-              metis coinmetis
-              PATHS "$ENV{IPOPT_HOME}/lib/"
-                    "/usr/lib"
+              coinmetis metis
+              HINTS "$ENV{IPOPT_HOME}/lib/"
+              PATHS "/usr/lib"
                     "/opt/local/lib"
-					"${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
+                    "${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
                     "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
                     )
                     
 find_library( METIS_LIBRARY_DEBUG
-              metisd coinmetisd
-              PATHS "$ENV{IPOPT_HOME}/lib/"
-                    "/usr/lib"
+              coinmetisd metisd
+              HINTS "$ENV{IPOPT_HOME}/lib/"
+              PATHS "/usr/lib"
                     "/opt/local/lib" 
-					"${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
+                    "${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
                     "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
                     )      
                     

cmake/FindMUMPS.cmake

@@ -35,24 +35,25 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*" )
 endif()
 
 find_path(MUMPS_INCLUDE_DIR NAMES dmumps_c.h
-     PATHS "$ENV{IPOPT_HOME}/ThirdParty/Mumps/MUMPS/include/"
-           "/usr/include/"
-		   "${VS_SEARCH_PATH}Ipopt-3.12.9/include/mumps"
+     HINTS "$ENV{IPOPT_HOME}/ThirdParty/Mumps/MUMPS/include/"
+           "$ENV{IPOPT_HOME}/include/coin/ThirdParty"
+     PATHS "/usr/include/"
+           "${VS_SEARCH_PATH}Ipopt-3.12.9/include/mumps"
            "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/include/mumps"
    )
    
 find_library( MUMPS_LIBRARY_DEBUG
-              dmumpsd coinmumpsd coinmumpscd
-              PATHS "$ENV{IPOPT_HOME}/lib/"
-                    "/usr/lib"
-					"${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
+              coinmumpsd dmumpsd coinmumpscd
+              HITNS "$ENV{IPOPT_HOME}/lib/"
+              PATHS "/usr/lib"
+                    "${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
                     "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
                     )
                     
 find_library( MUMPS_LIBRARY_RELEASE
-              dmumps coinmumps coinmumpsc
-              PATHS "$ENV{IPOPT_HOME}/lib/"
-                    "/usr/lib"
+              coinmumps dmumps coinmumpsc
+              HINTS "$ENV{IPOPT_HOME}/lib/"
+              PATHS "/usr/lib"
 					"${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
                     "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
                     )                    

cmake/FindSUITESPARSE.cmake

@@ -16,153 +16,204 @@ IF (SUITESPARSE_INCLUDE_DIRS)
 ENDIF (SUITESPARSE_INCLUDE_DIRS)
 
 if( WIN32 )
-   # Find cholmod part of the suitesparse library collection
-
-   # Check if the base path is set
-   if ( NOT CMAKE_WINDOWS_LIBS_DIR )
-     # This is the base directory for windows library search used in the finders we shipp.
-     set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." )
-   endif()
-
-   if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" )
-     SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/")
-   elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
-     SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x32/")
-   elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
-     SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/")
-   elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
-     SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x32/")
-   elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*Win64" )
-     SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x64/")
-   elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" )
-     SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x32/")
-   endif()
-
-
-   FIND_PATH( CHOLMOD_INCLUDE_DIR cholmod.h
-              PATHS "C:\\libs\\win32\\SuiteSparse\\Include"
-         	    "${VS_SEARCH_PATH}"
-	      PATH_SUFFIXES suitesparse-4.2.1/include/suitesparse
-		                suitesparse-metis-for-windows-1.2.2-install/include/suitesparse
-		      )
-
-   # Add cholmod include directory to collection include directories
-   IF ( CHOLMOD_INCLUDE_DIR )
-	list ( APPEND SUITESPARSE_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR} )
-   ENDIF( CHOLMOD_INCLUDE_DIR )
-
-
-   # find path suitesparse library
-   FIND_PATH( SUITESPARSE_LIBRARY_DIRS
-	       NAMES amd.lib libamd.lib
-               PATHS "C:\\libs\\win32\\SuiteSparse\\libs"
-                     "${VS_SEARCH_PATH}"
-               PATH_SUFFIXES suitesparse-4.2.1/lib64
-                             suitesparse-metis-for-windows-1.2.2-install/lib64			   )
-
-   # if we found the library, add it to the defined libraries
-   IF ( SUITESPARSE_LIBRARY_DIRS )
-     if ( EXISTS "${SUITESPARSE_LIBRARY_DIRS}/libamd.lib" )
-	   list ( APPEND SUITESPARSE_LIBRARIES optimized;libamd;optimized;libcamd;optimized;libccolamd;optimized;libcholmod;optimized;libcolamd;optimized;metis;optimized;libspqr;optimized;libumfpack;debug;libamdd;debug;libcamdd;debug;libccolamdd;debug;libcholmodd;debug;libspqrd;debug;libumfpackd;debug;libcolamdd;debug;metisd;optimized;liblapack;debug;liblapackd;optimized;suitesparseconfig;debug;suitesparseconfigd )
-     else()
-	   list ( APPEND SUITESPARSE_LIBRARIES optimized;amd;optimized;camd;optimized;ccolamd;optimized;cholmod;optimized;colamd;optimized;metis;optimized;spqr;optimized;umfpack;debug;amdd;debug;camdd;debug;ccolamdd;debug;cholmodd;debug;spqrd;debug;umfpackd;debug;colamdd;debug;metisd;optimized;blas;optimized;libf2c;optimized;lapack;debug;blasd;debug;libf2cd;debug;lapackd )
-	 endif()
-
-     if(EXISTS  "${CHOLMOD_INCLUDE_DIR}/SuiteSparseQR.hpp")
-	   SET(SUITESPARSE_SPQR_VALID TRUE CACHE BOOL "SuiteSparseSPQR valid")
-     else()
-	   SET(SUITESPARSE_SPQR_VALID FALSE CACHE BOOL "SuiteSparseSPQR valid")
-     endif()
-
-     if(SUITESPARSE_SPQR_VALID)
-	   FIND_LIBRARY( SUITESPARSE_SPQR_LIBRARY
-		             NAMES libspqr
-		             PATHS ${SUITESPARSE_LIBRARY_DIRS} )
-	   IF (SUITESPARSE_SPQR_LIBRARY)
-	     list ( APPEND SUITESPARSE_LIBRARIES optimized;libspqr;debug;libspqrd)
-	   ENDIF (SUITESPARSE_SPQR_LIBRARY)
-     endif()
-
-
-   ENDIF( SUITESPARSE_LIBRARY_DIRS )
+  # Find cholmod part of the suitesparse library collection
+
+  # Check if the base path is set
+  if ( NOT CMAKE_WINDOWS_LIBS_DIR )
+    # This is the base directory for windows library search used in the finders we shipp.
+    set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." )
+  endif()
+
+  if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*Win64" )
+    SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x64/")
+  elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
+    SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2012/x32/")
+  elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*Win64" )
+    SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x64/")
+  elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 12.*" )
+    SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2013/x32/")
+  elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*Win64" )
+    SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x64/")
+  elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" )
+    SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x32/")
+  endif()
+
 
-else( WIN32 )
   FIND_PATH( CHOLMOD_INCLUDE_DIR cholmod.h
-        	      PATHS /usr/local/include
-        	            /usr/include
-        	            /usr/include/suitesparse/
-                      /opt/local/include/
-        	            ${CMAKE_SOURCE_DIR}/MacOS/Libs/cholmod
-              	      PATH_SUFFIXES cholmod/ CHOLMOD/ )
-
-
-  FIND_PATH( SUITESPARSE_LIBRARY_DIR
-                      NAMES libcholmod.so libcholmod.dylib
-                      PATHS /usr/lib
-                            /usr/lib64
-                            /usr/local/lib
-                            /opt/local/lib
-			    /usr/lib/x86_64-linux-gnu )
-
-  list ( APPEND SUITESPARSE_LIBRARY_DIRS ${SUITESPARSE_LIBRARY_DIR} )
-
-
-   # Add cholmod include directory to collection include directories
-   IF ( CHOLMOD_INCLUDE_DIR )
-	list ( APPEND SUITESPARSE_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR} )
-   ENDIF( CHOLMOD_INCLUDE_DIR )
-
-
-   # if we found the library, add it to the defined libraries
-   IF ( SUITESPARSE_LIBRARY_DIR )
-
-       # Skipped, as this is set for apple in the block above
-#       if (NOT APPLE)
-         list ( APPEND SUITESPARSE_LIBRARIES amd)
-         list ( APPEND SUITESPARSE_LIBRARIES btf)
-         list ( APPEND SUITESPARSE_LIBRARIES camd)
-         list ( APPEND SUITESPARSE_LIBRARIES ccolamd)
-         list ( APPEND SUITESPARSE_LIBRARIES cholmod)
-         list ( APPEND SUITESPARSE_LIBRARIES colamd)
- #       list ( APPEND SUITESPARSE_LIBRARIES csparse)
-         list ( APPEND SUITESPARSE_LIBRARIES cxsparse)
-         list ( APPEND SUITESPARSE_LIBRARIES klu)
- #       list ( APPEND SUITESPARSE_LIBRARIES spqr)
-         list ( APPEND SUITESPARSE_LIBRARIES umfpack)
- #      endif()
-
-       # Metis and spqr are optional
-       FIND_LIBRARY( SUITESPARSE_METIS_LIBRARY
-                     NAMES metis
-                     PATHS ${SUITESPARSE_LIBRARY_DIR} )
-       IF (SUITESPARSE_METIS_LIBRARY)
-	  list ( APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_METIS_LIBRARY})
-       ENDIF(SUITESPARSE_METIS_LIBRARY)
-
-       if(EXISTS  "${CHOLMOD_INCLUDE_DIR}/SuiteSparseQR.hpp")
-	  SET(SUITESPARSE_SPQR_VALID TRUE CACHE BOOL "SuiteSparseSPQR valid")
-       else()
-	  SET(SUITESPARSE_SPQR_VALID false CACHE BOOL "SuiteSparseSPQR valid")
-       endif()
-
-       if(SUITESPARSE_SPQR_VALID)
-	  FIND_LIBRARY( SUITESPARSE_SPQR_LIBRARY
-		      NAMES spqr
-		      PATHS ${SUITESPARSE_LIBRARY_DIR} )
-	  IF (SUITESPARSE_SPQR_LIBRARY)
-	    list ( APPEND SUITESPARSE_LIBRARIES spqr)
-	  ENDIF (SUITESPARSE_SPQR_LIBRARY)
-       endif()
-
-    ENDIF( SUITESPARSE_LIBRARY_DIR )
+    PATHS "C:\\libs\\win32\\SuiteSparse\\Include"
+    "${VS_SEARCH_PATH}"
+    PATH_SUFFIXES suitesparse-4.2.1/include/suitesparse
+    suitesparse-metis-for-windows-1.2.2-install/include/suitesparse
+    )
+
+  # Add cholmod include directory to collection include directories
+  IF ( CHOLMOD_INCLUDE_DIR )
+    list ( APPEND SUITESPARSE_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR} )
+  ENDIF( CHOLMOD_INCLUDE_DIR )
+
+
+  # find path suitesparse library
+  FIND_PATH( SUITESPARSE_LIBRARY_DIRS
+    NAMES amd.lib libamd.lib
+    PATHS "C:\\libs\\win32\\SuiteSparse\\libs"
+    "${VS_SEARCH_PATH}"
+    PATH_SUFFIXES suitesparse-4.2.1/lib64
+    suitesparse-metis-for-windows-1.2.2-install/lib64			   )
+
+  # if we found the library, add it to the defined libraries
+  IF ( SUITESPARSE_LIBRARY_DIRS )
+    set(LIBS_HAVE_LIB_PREFIX FALSE)
+    foreach(dir ${SUITESPARSE_LIBRARY_DIRS})
+      if (EXISTS "${dir}/libamd.lib")
+        set (LIBS_HAVE_LIB_PREFIX TRUE)
+      endif()
+    endforeach()
+    if ( LIBS_HAVE_LIB_PREFIX )
+      list ( APPEND SUITESPARSE_LIBRARY_DIRS "${SUITESPARSE_LIBRARY_DIRS}/lapack_blas_windows") # because liblapack.lib lies here
+      list ( APPEND SUITESPARSE_LIBRARIES optimized;libamd;optimized;libcamd;optimized;libccolamd;optimized;libcholmod;optimized;libcolamd;optimized;metis;optimized;libspqr;optimized;libumfpack;debug;libamdd;debug;libcamdd;debug;libccolamdd;debug;libcholmodd;debug;libspqrd;debug;libumfpackd;debug;libcolamdd;debug;metisd;optimized;liblapack;debug;liblapackd;optimized;suitesparseconfig;debug;suitesparseconfigd )
+    else()
+      list ( APPEND SUITESPARSE_LIBRARIES optimized;amd;optimized;camd;optimized;ccolamd;optimized;cholmod;optimized;colamd;optimized;metis;optimized;spqr;optimized;umfpack;debug;amdd;debug;camdd;debug;ccolamdd;debug;cholmodd;debug;spqrd;debug;umfpackd;debug;colamdd;debug;metisd;optimized;blas;optimized;libf2c;optimized;lapack;debug;blasd;debug;libf2cd;debug;lapackd )
+    endif()
+
+    if(EXISTS  "${CHOLMOD_INCLUDE_DIR}/SuiteSparseQR.hpp")
+      SET(SUITESPARSE_SPQR_VALID TRUE CACHE BOOL "SuiteSparseSPQR valid")
+    else()
+      SET(SUITESPARSE_SPQR_VALID FALSE CACHE BOOL "SuiteSparseSPQR valid")
+    endif()
+
+    if(SUITESPARSE_SPQR_VALID)
+      FIND_LIBRARY( SUITESPARSE_SPQR_LIBRARY
+        NAMES libspqr
+        PATHS ${SUITESPARSE_LIBRARY_DIRS} )
+      IF (SUITESPARSE_SPQR_LIBRARY)
+        list ( APPEND SUITESPARSE_LIBRARIES optimized;libspqr;debug;libspqrd)
+      ELSE (SUITESPARSE_SPQR_LIBRARY)
+        SET(SUITESPARSE_SPQR_VALID FALSE)
+      ENDIF (SUITESPARSE_SPQR_LIBRARY)
+    endif()
+
+
+  ENDIF( SUITESPARSE_LIBRARY_DIRS )
+
+else( WIN32 )
+  if( APPLE)
+    FIND_PATH( CHOLMOD_INCLUDE_DIR cholmod.h
+      PATHS  /opt/local/include/ufsparse )
+
+    FIND_LIBRARY(SUITESPARSE_LIBRARY
+      NAMES libSuiteSparse.dylib
+      PATHS /opt/local/lib)
+    message("SUITESPARSE_LIBRARY: ${SUITESPARSE_LIBRARY}")
+
+    FIND_PATH( SUITESPARSE_LIBRARY_DIR
+      NAMES libSuiteSparse.dylib
+      PATHS /opt/local/lib )
+
+    message("SUITESPARSE_LIBRARY_DIR: ${SUITESPARSE_LIBRARY_DIR}")
+    list ( APPEND SUITESPARSE_LIBRARY_DIRS ${SUITESPARSE_LIBRARY_DIR} )
+
+    list ( APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_LIBRARY})
+
+  else(APPLE)
+    FIND_PATH( CHOLMOD_INCLUDE_DIR cholmod.h
+      PATHS /usr/local/include
+      /usr/include
+      /usr/include/suitesparse/
+      /opt/local/include/
+      ${CMAKE_SOURCE_DIR}/MacOS/Libs/cholmod
+      PATH_SUFFIXES cholmod/ CHOLMOD/ )
+
+
+    FIND_PATH( SUITESPARSE_LIBRARY_DIR
+      NAMES libcholmod.so libcholmod.dylib
+      PATHS /usr/lib
+      /usr/lib64
+      /usr/local/lib
+      /opt/local/lib
+      /usr/lib/x86_64-linux-gnu )
+
+
+  endif(APPLE)
+
+  # Add cholmod include directory to collection include directories
+  IF ( CHOLMOD_INCLUDE_DIR )
+    list ( APPEND SUITESPARSE_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR} )
+  ENDIF( CHOLMOD_INCLUDE_DIR )
+
+
+  # if we found the library, add it to the defined libraries
+  IF ( SUITESPARSE_LIBRARY_DIR )
+
+    FIND_LIBRARY(SUITESPARSE_AMD_LIBRARY
+                 NAMES amd
+                 PATHS ${SUITESPARSE_LIBRARY_DIR})
+    list ( APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_AMD_LIBRARY})
+    FIND_LIBRARY(SUITESPARSE_CAMD_LIBRARY
+                 NAMES camd
+                 PATHS ${SUITESPARSE_LIBRARY_DIR})
+    list ( APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_CAMD_LIBRARY})
+    FIND_LIBRARY(SUITESPARSE_CCOLAMD_LIBRARY
+                 NAMES ccolamd
+                 PATHS ${SUITESPARSE_LIBRARY_DIR})
+    list ( APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_CCOLAMD_LIBRARY})
+    FIND_LIBRARY(SUITESPARSE_CHOLMOD_LIBRARY
+                 NAMES cholmod
+                 PATHS ${SUITESPARSE_LIBRARY_DIR})
+    list ( APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_CHOLMOD_LIBRARY})
+    FIND_LIBRARY(SUITESPARSE_COLAMD_LIBRARY
+                 NAMES cholmod
+                 PATHS ${SUITESPARSE_LIBRARY_DIR})
+    list ( APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_COLAMD_LIBRARY})
+    FIND_LIBRARY(SUITESPARSE_CXSPARSE_LIBRARY
+                 NAMES cxsparse
+                 PATHS ${SUITESPARSE_LIBRARY_DIR})
+    list ( APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_CXSPARSE_LIBRARY})
+    FIND_LIBRARY(SUITESPARSE_KLU_LIBRARY
+                 NAMES klu
+                 PATHS ${SUITESPARSE_LIBRARY_DIR})
+    list ( APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_KLU_LIBRARY})
+    FIND_LIBRARY(SUITESPARSE_UMFPACK_LIBRARY
+                 NAMES umfpack
+                 PATHS ${SUITESPARSE_LIBRARY_DIR})
+    list ( APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_UMFPACK_LIBRARY})
+
+    #       list ( APPEND SUITESPARSE_LIBRARIES csparse)
+    #       list ( APPEND SUITESPARSE_LIBRARIES spqr)
+
+    # Metis and spqr are optional
+    FIND_LIBRARY( SUITESPARSE_METIS_LIBRARY
+                  NAMES coinmetis metis
+                  HINTS "$ENV{IPOPT_HOME}/lib"
+                  PATHS ${SUITESPARSE_LIBRARY_DIR} )
+    IF (SUITESPARSE_METIS_LIBRARY)
+      list ( APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_METIS_LIBRARY})
+    ENDIF(SUITESPARSE_METIS_LIBRARY)
+
+    if(EXISTS  "${CHOLMOD_INCLUDE_DIR}/SuiteSparseQR.hpp")
+      SET(SUITESPARSE_SPQR_VALID TRUE CACHE BOOL "SuiteSparseSPQR valid")
+    else()
+      SET(SUITESPARSE_SPQR_VALID false CACHE BOOL "SuiteSparseSPQR valid")
+    endif()
+
+    if(SUITESPARSE_SPQR_VALID)
+      FIND_LIBRARY( SUITESPARSE_SPQR_LIBRARY
+        NAMES spqr
+        PATHS ${SUITESPARSE_LIBRARY_DIR} )
+      IF (SUITESPARSE_SPQR_LIBRARY)
+        list ( APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_SPQR_LIBRARY})
+      ENDIF (SUITESPARSE_SPQR_LIBRARY)
+    endif()
+
+  ENDIF( SUITESPARSE_LIBRARY_DIR )
 
 endif( WIN32 )
 
-IF (SUITESPARSE_INCLUDE_DIRS AND SUITESPARSE_LIBRARIES)
-   IF(WIN32)
+IF (SUITESPARSE_LIBRARY_DIR AND SUITESPARSE_LIBRARIES)
+  IF(WIN32)
     list (APPEND SUITESPARSE_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR}/../../UFconfig )
-   ENDIF(WIN32)
-   SET(SUITESPARSE_FOUND TRUE)
-ELSE (SUITESPARSE_INCLUDE_DIRS AND SUITESPARSE_LIBRARIES)
-   SET( SUITESPARSE_FOUND FALSE )
-ENDIF (SUITESPARSE_INCLUDE_DIRS AND SUITESPARSE_LIBRARIES)
+  ENDIF(WIN32)
+  SET(SUITESPARSE_FOUND TRUE)
+ELSE (SUITESPARSE_LIBRARY_DIR AND SUITESPARSE_LIBRARIES)
+  SET( SUITESPARSE_FOUND FALSE )
+ENDIF (SUITESPARSE_LIBRARY_DIR AND SUITESPARSE_LIBRARIES)
+