...
 
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
# SUITESPARSE_LIBRARY_DIRS - all Library directories containing suitesparse libs # SUITESPARSE_LIBRARY_DIRS - all Library directories containing suitesparse libs
# SUITESPARSE_SPQR_VALID - automatic identification whether or not spqr package is installed correctly # SUITESPARSE_SPQR_VALID - automatic identification whether or not spqr package is installed correctly
IF (SUITESPARSE_INCLUDE_DIRS) if (SUITESPARSE_INCLUDE_DIRS)
# Already in cache, be silent # Already in cache, be silent
SET(SUITESPARSE_FIND_QUIETLY TRUE) SET(SUITESPARSE_FIND_QUIETLY TRUE)
ENDIF (SUITESPARSE_INCLUDE_DIRS) endif (SUITESPARSE_INCLUDE_DIRS)
if( WIN32 ) if( WIN32 )
# Find cholmod part of the suitesparse library collection # Find cholmod part of the suitesparse library collection
...@@ -47,9 +47,9 @@ if( WIN32 ) ...@@ -47,9 +47,9 @@ if( WIN32 )
) )
# Add cholmod include directory to collection include directories # Add cholmod include directory to collection include directories
IF ( CHOLMOD_INCLUDE_DIR ) if ( CHOLMOD_INCLUDE_DIR )
list ( APPEND SUITESPARSE_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR} ) list ( APPEND SUITESPARSE_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR} )
ENDIF( CHOLMOD_INCLUDE_DIR ) endif( CHOLMOD_INCLUDE_DIR )
# find path suitesparse library # find path suitesparse library
...@@ -61,7 +61,7 @@ if( WIN32 ) ...@@ -61,7 +61,7 @@ if( WIN32 )
suitesparse-metis-for-windows-1.2.2-install/lib64 ) suitesparse-metis-for-windows-1.2.2-install/lib64 )
# if we found the library, add it to the defined libraries # if we found the library, add it to the defined libraries
IF ( SUITESPARSE_LIBRARY_DIRS ) if ( SUITESPARSE_LIBRARY_DIRS )
if ( EXISTS "${SUITESPARSE_LIBRARY_DIRS}/libamd.lib" ) if ( EXISTS "${SUITESPARSE_LIBRARY_DIRS}/libamd.lib" )
list ( APPEND SUITESPARSE_LIBRARY_DIRS "${SUITESPARSE_LIBRARY_DIRS}/lapack_blas_windows") # because liblapack.lib lies here 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 ) 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 )
...@@ -79,16 +79,18 @@ if( WIN32 ) ...@@ -79,16 +79,18 @@ if( WIN32 )
FIND_LIBRARY( SUITESPARSE_SPQR_LIBRARY FIND_LIBRARY( SUITESPARSE_SPQR_LIBRARY
NAMES libspqr NAMES libspqr
PATHS ${SUITESPARSE_LIBRARY_DIRS} ) PATHS ${SUITESPARSE_LIBRARY_DIRS} )
IF (SUITESPARSE_SPQR_LIBRARY) if (SUITESPARSE_SPQR_LIBRARY)
list ( APPEND SUITESPARSE_LIBRARIES optimized;libspqr;debug;libspqrd) list ( APPEND SUITESPARSE_LIBRARIES optimized;libspqr;debug;libspqrd)
ENDIF (SUITESPARSE_SPQR_LIBRARY) else(SUITESPARSE_SPQR_LIBRARY)
SET(SUITESPARSE_SPQR_VALID FALSE)
endif (SUITESPARSE_SPQR_LIBRARY)
endif() endif()
ENDIF( SUITESPARSE_LIBRARY_DIRS ) endif( SUITESPARSE_LIBRARY_DIRS )
else( WIN32 ) else( WIN32 )
IF( APPLE) if( APPLE)
FIND_PATH( CHOLMOD_INCLUDE_DIR cholmod.h FIND_PATH( CHOLMOD_INCLUDE_DIR cholmod.h
PATHS /opt/local/include/ufsparse ) PATHS /opt/local/include/ufsparse )
...@@ -101,7 +103,7 @@ else( WIN32 ) ...@@ -101,7 +103,7 @@ else( WIN32 )
list ( APPEND SUITESPARSE_LIBRARIES SuiteSparse) list ( APPEND SUITESPARSE_LIBRARIES SuiteSparse)
ELSE(APPLE) else(APPLE)
FIND_PATH( CHOLMOD_INCLUDE_DIR cholmod.h FIND_PATH( CHOLMOD_INCLUDE_DIR cholmod.h
PATHS /usr/local/include PATHS /usr/local/include
/usr/include /usr/include
...@@ -118,19 +120,19 @@ else( WIN32 ) ...@@ -118,19 +120,19 @@ else( WIN32 )
/usr/lib/x86_64-linux-gnu ) /usr/lib/x86_64-linux-gnu )
ENDIF(APPLE) endif(APPLE)
# Add cholmod include directory to collection include directories # Add cholmod include directory to collection include directories
IF ( CHOLMOD_INCLUDE_DIR ) if ( CHOLMOD_INCLUDE_DIR )
list ( APPEND SUITESPARSE_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR} ) list ( APPEND SUITESPARSE_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR} )
ENDIF( CHOLMOD_INCLUDE_DIR ) endif( CHOLMOD_INCLUDE_DIR )
# if we found the library, add it to the defined libraries # if we found the library, add it to the defined libraries
IF ( SUITESPARSE_LIBRARY_DIR ) if ( SUITESPARSE_LIBRARY_DIR )
# Skipped, as this is set for apple in the block above # Skipped, as this is set for apple in the block above
# if (NOT APPLE) # if (NOT APPLE)
list ( APPEND SUITESPARSE_LIBRARIES amd) list ( APPEND SUITESPARSE_LIBRARIES amd)
list ( APPEND SUITESPARSE_LIBRARIES btf) list ( APPEND SUITESPARSE_LIBRARIES btf)
list ( APPEND SUITESPARSE_LIBRARIES camd) list ( APPEND SUITESPARSE_LIBRARIES camd)
...@@ -148,9 +150,9 @@ else( WIN32 ) ...@@ -148,9 +150,9 @@ else( WIN32 )
FIND_LIBRARY( SUITESPARSE_METIS_LIBRARY FIND_LIBRARY( SUITESPARSE_METIS_LIBRARY
NAMES metis NAMES metis
PATHS ${SUITESPARSE_LIBRARY_DIR} ) PATHS ${SUITESPARSE_LIBRARY_DIR} )
IF (SUITESPARSE_METIS_LIBRARY) if (SUITESPARSE_METIS_LIBRARY)
list ( APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_METIS_LIBRARY}) list ( APPEND SUITESPARSE_LIBRARIES ${SUITESPARSE_METIS_LIBRARY})
ENDIF(SUITESPARSE_METIS_LIBRARY) endif(SUITESPARSE_METIS_LIBRARY)
if(EXISTS "${CHOLMOD_INCLUDE_DIR}/SuiteSparseQR.hpp") if(EXISTS "${CHOLMOD_INCLUDE_DIR}/SuiteSparseQR.hpp")
SET(SUITESPARSE_SPQR_VALID TRUE CACHE BOOL "SuiteSparseSPQR valid") SET(SUITESPARSE_SPQR_VALID TRUE CACHE BOOL "SuiteSparseSPQR valid")
...@@ -162,21 +164,21 @@ else( WIN32 ) ...@@ -162,21 +164,21 @@ else( WIN32 )
FIND_LIBRARY( SUITESPARSE_SPQR_LIBRARY FIND_LIBRARY( SUITESPARSE_SPQR_LIBRARY
NAMES spqr NAMES spqr
PATHS ${SUITESPARSE_LIBRARY_DIR} ) PATHS ${SUITESPARSE_LIBRARY_DIR} )
IF (SUITESPARSE_SPQR_LIBRARY) if (SUITESPARSE_SPQR_LIBRARY)
list ( APPEND SUITESPARSE_LIBRARIES spqr) list ( APPEND SUITESPARSE_LIBRARIES spqr)
ENDIF (SUITESPARSE_SPQR_LIBRARY) endif (SUITESPARSE_SPQR_LIBRARY)
endif() endif()
ENDIF( SUITESPARSE_LIBRARY_DIR ) endif( SUITESPARSE_LIBRARY_DIR )
endif( WIN32 ) endif( WIN32 )
IF (SUITESPARSE_LIBRARY_DIR AND SUITESPARSE_LIBRARIES) if (SUITESPARSE_LIBRARY_DIR AND SUITESPARSE_LIBRARIES)
IF(WIN32) if(WIN32)
list (APPEND SUITESPARSE_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR}/../../UFconfig ) list (APPEND SUITESPARSE_INCLUDE_DIRS ${CHOLMOD_INCLUDE_DIR}/../../UFconfig )
ENDIF(WIN32) endif(WIN32)
SET(SUITESPARSE_FOUND TRUE) SET(SUITESPARSE_FOUND TRUE)
ELSE (SUITESPARSE_LIBRARY_DIR AND SUITESPARSE_LIBRARIES) else (SUITESPARSE_LIBRARY_DIR AND SUITESPARSE_LIBRARIES)
SET( SUITESPARSE_FOUND FALSE ) SET( SUITESPARSE_FOUND FALSE )
ENDIF (SUITESPARSE_LIBRARY_DIR AND SUITESPARSE_LIBRARIES) endif (SUITESPARSE_LIBRARY_DIR AND SUITESPARSE_LIBRARIES)