it is now up to user of these Find* module to find and link to BLAS and/or LAPACK

This commit is contained in:
Gael Guennebaud 2011-02-18 11:23:27 +01:00
parent 3345ea0ddd
commit d8ca948148
3 changed files with 44 additions and 57 deletions

View File

@ -1,3 +1,5 @@
# Cholmod lib usually requires linking to a blas and lapack library.
# It is up to the user of this module to find a BLAS and link to it.
if (CHOLMOD_INCLUDES AND CHOLMOD_LIBRARIES) if (CHOLMOD_INCLUDES AND CHOLMOD_LIBRARIES)
set(CHOLMOD_FIND_QUIETLY TRUE) set(CHOLMOD_FIND_QUIETLY TRUE)

View File

@ -1,12 +1,11 @@
# Umfpack lib usually requires linking to a blas library.
# It is up to the user of this module to find a BLAS and link to it.
if (SUPERLU_INCLUDES AND SUPERLU_LIBRARIES) if (SUPERLU_INCLUDES AND SUPERLU_LIBRARIES)
set(SUPERLU_FIND_QUIETLY TRUE) set(SUPERLU_FIND_QUIETLY TRUE)
endif (SUPERLU_INCLUDES AND SUPERLU_LIBRARIES) endif (SUPERLU_INCLUDES AND SUPERLU_LIBRARIES)
find_package(BLAS)
if(BLAS_FOUND)
find_path(SUPERLU_INCLUDES find_path(SUPERLU_INCLUDES
NAMES NAMES
supermatrix.h supermatrix.h
@ -19,12 +18,6 @@ if(BLAS_FOUND)
find_library(SUPERLU_LIBRARIES superlu PATHS $ENV{SUPERLUDIR} ${LIB_INSTALL_DIR}) find_library(SUPERLU_LIBRARIES superlu PATHS $ENV{SUPERLUDIR} ${LIB_INSTALL_DIR})
if(SUPERLU_LIBRARIES)
set(SUPERLU_LIBRARIES ${SUPERLU_LIBRARIES} ${BLAS_LIBRARIES})
endif(SUPERLU_LIBRARIES)
endif(BLAS_FOUND)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SUPERLU DEFAULT_MSG find_package_handle_standard_args(SUPERLU DEFAULT_MSG
SUPERLU_INCLUDES SUPERLU_LIBRARIES) SUPERLU_INCLUDES SUPERLU_LIBRARIES)

View File

@ -1,12 +1,10 @@
# Umfpack lib usually requires linking to a blas library.
# It is up to the user of this module to find a BLAS and link to it.
if (UMFPACK_INCLUDES AND UMFPACK_LIBRARIES) if (UMFPACK_INCLUDES AND UMFPACK_LIBRARIES)
set(UMFPACK_FIND_QUIETLY TRUE) set(UMFPACK_FIND_QUIETLY TRUE)
endif (UMFPACK_INCLUDES AND UMFPACK_LIBRARIES) endif (UMFPACK_INCLUDES AND UMFPACK_LIBRARIES)
find_package(BLAS)
if(BLAS_FOUND)
find_path(UMFPACK_INCLUDES find_path(UMFPACK_INCLUDES
NAMES NAMES
umfpack.h umfpack.h
@ -43,12 +41,6 @@ if(BLAS_FOUND)
endif(UMFPACK_LIBRARIES) endif(UMFPACK_LIBRARIES)
if(UMFPACK_LIBRARIES)
set(UMFPACK_LIBRARIES ${UMFPACK_LIBRARIES} ${BLAS_LIBRARIES})
endif(UMFPACK_LIBRARIES)
endif(BLAS_FOUND)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(UMFPACK DEFAULT_MSG find_package_handle_standard_args(UMFPACK DEFAULT_MSG