diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2008-11-05 13:47:55 +0000 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2008-11-05 13:47:55 +0000 |
| commit | 86ccd99d8d9a87d03f2f327766a02cc13849b54d (patch) | |
| tree | 38dc0f0ad8253bc14d8b939d6e0f6f5cef440433 /cmake | |
| parent | 9aba671cfc9d25357f74ba3811e182b8937e0d09 (diff) | |
Several improvements in sparse module:
* add a LDL^T factorization with solver using code from T. Davis's LDL
library (LPGL2.1+)
* various bug fixes in trianfular solver, matrix product, etc.
* improve cmake files for the supported libraries
* split the sparse unit test
* etc.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindCholmod.cmake | 4 | ||||
| -rw-r--r-- | cmake/FindSuperLU.cmake | 4 | ||||
| -rw-r--r-- | cmake/FindUmfpack.cmake | 11 |
3 files changed, 19 insertions, 0 deletions
diff --git a/cmake/FindCholmod.cmake b/cmake/FindCholmod.cmake index 444279ab9..3b9d5d3dc 100644 --- a/cmake/FindCholmod.cmake +++ b/cmake/FindCholmod.cmake @@ -61,6 +61,10 @@ if(CHOLMOD_LIBRARIES) endif(CHOLMOD_LIBRARIES) +if(CHOLMOD_LIBRARIES AND CMAKE_COMPILER_IS_GNUCXX) + set(CHOLMOD_LIBRARIES ${CHOLMOD_LIBRARIES} -lgfortran) +endif(CHOLMOD_LIBRARIES AND CMAKE_COMPILER_IS_GNUCXX) + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(CHOLMOD DEFAULT_MSG CHOLMOD_INCLUDES CHOLMOD_LIBRARIES) diff --git a/cmake/FindSuperLU.cmake b/cmake/FindSuperLU.cmake index 9d12ebd77..7383754e2 100644 --- a/cmake/FindSuperLU.cmake +++ b/cmake/FindSuperLU.cmake @@ -13,6 +13,10 @@ find_path(SUPERLU_INCLUDES find_library(SUPERLU_LIBRARIES superlu PATHS $ENV{SUPERLUDIR} ${LIB_INSTALL_DIR}) +if(SUPERLU_LIBRARIES AND CMAKE_COMPILER_IS_GNUCXX) + set(SUPERLU_LIBRARIES ${SUPERLU_LIBRARIES} -lgfortran) +endif(SUPERLU_LIBRARIES AND CMAKE_COMPILER_IS_GNUCXX) + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(SUPERLU DEFAULT_MSG SUPERLU_INCLUDES SUPERLU_LIBRARIES) diff --git a/cmake/FindUmfpack.cmake b/cmake/FindUmfpack.cmake index ae7883778..4f6875a32 100644 --- a/cmake/FindUmfpack.cmake +++ b/cmake/FindUmfpack.cmake @@ -3,6 +3,11 @@ if (UMFPACK_INCLUDES AND UMFPACK_LIBRARIES) set(UMFPACK_FIND_QUIETLY TRUE) endif (UMFPACK_INCLUDES AND UMFPACK_LIBRARIES) +enable_language(Fortran) +find_package(BLAS) + +if(BLAS_FOUND) + find_path(UMFPACK_INCLUDES NAMES umfpack.h @@ -39,6 +44,12 @@ if(UMFPACK_LIBRARIES) endif(UMFPACK_LIBRARIES) +if(UMFPACK_LIBRARIES) + set(UMFPACK_LIBRARIES ${UMFPACK_LIBRARIES} ${BLAS_LIBRARIES}) +endif(UMFPACK_LIBRARIES) + +endif(BLAS_FOUND) + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(UMFPACK DEFAULT_MSG UMFPACK_INCLUDES UMFPACK_LIBRARIES) |