Merge branch 'fixSuitesparseMacFinder' into 'master'

Fix suitesparse mac finder

See merge request !119

cmake/FindSUITESPARSE.cmake

 # - Try to find SUITESPARSE
 # Once done this will define
-#  
+#
 #  SUITESPARSE_FOUND            - system has SUITESPARSE
 #  SUITESPARSE_INCLUDE_DIRS     - the SUITESPARSE include directory
 #  SUITESPARSE_LIBRARIES        - Link these to use SUITESPARSE
@@ -37,7 +37,7 @@ if( WIN32 )
    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"
@@ -53,21 +53,21 @@ if( WIN32 )
 
 
    # find path suitesparse library
-   FIND_PATH( SUITESPARSE_LIBRARY_DIRS 
+   FIND_PATH( SUITESPARSE_LIBRARY_DIRS
 	       NAMES amd.lib libamd.lib
-               PATHS "C:\\libs\\win32\\SuiteSparse\\libs" 
+               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()   
+     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()  
-	 
+	 endif()
+
      if(EXISTS  "${CHOLMOD_INCLUDE_DIR}/SuiteSparseQR.hpp")
 	   SET(SUITESPARSE_SPQR_VALID TRUE CACHE BOOL "SuiteSparseSPQR valid")
      else()
@@ -78,45 +78,34 @@ if( WIN32 )
 	   FIND_LIBRARY( SUITESPARSE_SPQR_LIBRARY
 		             NAMES libspqr
 		             PATHS ${SUITESPARSE_LIBRARY_DIRS} )
-	   IF (SUITESPARSE_SPQR_LIBRARY)			
+	   IF (SUITESPARSE_SPQR_LIBRARY)
 	     list ( APPEND SUITESPARSE_LIBRARIES optimized;libspqr;debug;libspqrd)
 	   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_PATH( SUITESPARSE_LIBRARY_DIR
-                      NAMES libspqr.dylib
-                      PATHS /opt/local/lib )
 
-           list ( APPEND SUITESPARSE_LIBRARY_DIRS ${SUITESPARSE_LIBRARY_DIR} )
 
-           list ( APPEND SUITESPARSE_LIBRARIES spqr)
+   ENDIF( SUITESPARSE_LIBRARY_DIRS )
 
-   ELSE(APPLE)
-	   FIND_PATH( CHOLMOD_INCLUDE_DIR cholmod.h
-        	      PATHS /usr/local/include 
-        	            /usr/include 
-        	            /usr/include/suitesparse/ 
+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 
-                      PATHS /usr/lib 
-                            /usr/lib64 
+
+  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} )
 
-   ENDIF(APPLE)
 
    # Add cholmod include directory to collection include directories
    IF ( CHOLMOD_INCLUDE_DIR )
@@ -141,12 +130,12 @@ else( WIN32 )
  #       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)			
+       IF (SUITESPARSE_METIS_LIBRARY)
 	  list ( APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_METIS_LIBRARY})
        ENDIF(SUITESPARSE_METIS_LIBRARY)
 
@@ -160,13 +149,13 @@ else( WIN32 )
 	  FIND_LIBRARY( SUITESPARSE_SPQR_LIBRARY
 		      NAMES spqr
 		      PATHS ${SUITESPARSE_LIBRARY_DIR} )
-	  IF (SUITESPARSE_SPQR_LIBRARY)			
+	  IF (SUITESPARSE_SPQR_LIBRARY)
 	    list ( APPEND SUITESPARSE_LIBRARIES spqr)
 	  ENDIF (SUITESPARSE_SPQR_LIBRARY)
        endif()
-       
-    ENDIF( SUITESPARSE_LIBRARY_DIR )  
-   
+
+    ENDIF( SUITESPARSE_LIBRARY_DIR )
+
 endif( WIN32 )
 
 IF (SUITESPARSE_INCLUDE_DIRS AND SUITESPARSE_LIBRARIES)
@@ -177,4 +166,3 @@ IF (SUITESPARSE_INCLUDE_DIRS AND SUITESPARSE_LIBRARIES)
 ELSE (SUITESPARSE_INCLUDE_DIRS AND SUITESPARSE_LIBRARIES)
    SET( SUITESPARSE_FOUND FALSE )
 ENDIF (SUITESPARSE_INCLUDE_DIRS AND SUITESPARSE_LIBRARIES)
-