GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-12 03:39:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

clean FindUmfpack.cmake wrt enable_language(Fortran)

Browse Source
This commit is contained in:
Gael Guennebaud 2008-12-02 12:20:13 +00:00
parent 6b3d0e68e2
commit eb9dadf3b2
2 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cmake/FindUmfpack.cmake
View File

@ -3,12 +3,13 @@ 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)
enable_language(Fortran) if(CMAKE_Fortran_COMPILER_WORKS)
find_package(BLAS)
if(BLAS_FOUND) find_package(BLAS)
find_path(UMFPACK_INCLUDES if(BLAS_FOUND)
find_path(UMFPACK_INCLUDES
NAMES NAMES
umfpack.h umfpack.h
PATHS PATHS
@ -16,11 +17,11 @@ find_path(UMFPACK_INCLUDES
${INCLUDE_INSTALL_DIR} ${INCLUDE_INSTALL_DIR}
PATH_SUFFIXES PATH_SUFFIXES
suitesparse suitesparse
) )
find_library(UMFPACK_LIBRARIES umfpack PATHS $ENV{UMFPACKDIR} ${LIB_INSTALL_DIR}) find_library(UMFPACK_LIBRARIES umfpack PATHS $ENV{UMFPACKDIR} ${LIB_INSTALL_DIR})
if(UMFPACK_LIBRARIES) if(UMFPACK_LIBRARIES)
get_filename_component(UMFPACK_LIBDIR ${UMFPACK_LIBRARIES} PATH) get_filename_component(UMFPACK_LIBDIR ${UMFPACK_LIBRARIES} PATH)
@ -31,9 +32,9 @@ if(UMFPACK_LIBRARIES)
set(UMFPACK_LIBRARIES FALSE) set(UMFPACK_LIBRARIES FALSE)
endif (AMD_LIBRARY) endif (AMD_LIBRARY)
endif(UMFPACK_LIBRARIES) endif(UMFPACK_LIBRARIES)
if(UMFPACK_LIBRARIES) if(UMFPACK_LIBRARIES)
find_library(COLAMD_LIBRARY colamd PATHS ${UMFPACK_LIBDIR} $ENV{UMFPACKDIR} ${LIB_INSTALL_DIR}) find_library(COLAMD_LIBRARY colamd PATHS ${UMFPACK_LIBDIR} $ENV{UMFPACKDIR} ${LIB_INSTALL_DIR})
if (COLAMD_LIBRARY) if (COLAMD_LIBRARY)
@ -42,16 +43,18 @@ if(UMFPACK_LIBRARIES)
set(UMFPACK_LIBRARIES FALSE) set(UMFPACK_LIBRARIES FALSE)
endif (COLAMD_LIBRARY) endif (COLAMD_LIBRARY)
endif(UMFPACK_LIBRARIES) endif(UMFPACK_LIBRARIES)
if(UMFPACK_LIBRARIES) if(UMFPACK_LIBRARIES)
set(UMFPACK_LIBRARIES ${UMFPACK_LIBRARIES} ${BLAS_LIBRARIES}) set(UMFPACK_LIBRARIES ${UMFPACK_LIBRARIES} ${BLAS_LIBRARIES})
endif(UMFPACK_LIBRARIES) endif(UMFPACK_LIBRARIES)
endif(BLAS_FOUND) endif(BLAS_FOUND)
include(FindPackageHandleStandardArgs) endif(CMAKE_Fortran_COMPILER_WORKS)
find_package_handle_standard_args(UMFPACK DEFAULT_MSG
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(UMFPACK DEFAULT_MSG
UMFPACK_INCLUDES UMFPACK_LIBRARIES) UMFPACK_INCLUDES UMFPACK_LIBRARIES)
mark_as_advanced(UMFPACK_INCLUDES UMFPACK_LIBRARIES AMD_LIBRARY COLAMD_LIBRARY) mark_as_advanced(UMFPACK_INCLUDES UMFPACK_LIBRARIES AMD_LIBRARY COLAMD_LIBRARY)

1
test/CMakeLists.txt
View File

@ -25,6 +25,7 @@ else(CHOLMOD_FOUND)
message("CHOLMOD not found, this optional backend won't be tested") message("CHOLMOD not found, this optional backend won't be tested")
endif(CHOLMOD_FOUND) endif(CHOLMOD_FOUND)
enable_language(Fortran OPTIONAL)
find_package(Umfpack) find_package(Umfpack)
if(UMFPACK_FOUND) if(UMFPACK_FOUND)
add_definitions("-DEIGEN_UMFPACK_SUPPORT") add_definitions("-DEIGEN_UMFPACK_SUPPORT")