Commit 8aa43b17 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

update find package umfpack

parent 162e0367
...@@ -78,8 +78,7 @@ target_enable_boost(amdis_base INTERFACE ON) ...@@ -78,8 +78,7 @@ target_enable_boost(amdis_base INTERFACE ON)
# -------------------- # --------------------
if (AMDIS_NEED_UMFPACK) if (AMDIS_NEED_UMFPACK)
set(AMDIS_SuiteSparse_DIR @SuiteSparse_DIR@) set(AMDIS_SuiteSparse_DIR @SuiteSparse_DIR@)
set(AMDIS_UMFPACK_INCLUDE_DIR @UMFPACK_INCLUDE_DIRS@) set(AMDIS_UMFPACK_ROOT_DIR @UMFPACK_INCLUDE_DIRS@/..)
set(AMDIS_UMFPACK_LIB_DIR ${AMDIS_UMFPACK_INCLUDE_DIR}/../include)
target_enable_umfpack(amdis_base INTERFACE ON) target_enable_umfpack(amdis_base INTERFACE ON)
endif (AMDIS_NEED_UMFPACK) endif (AMDIS_NEED_UMFPACK)
......
...@@ -26,11 +26,13 @@ macro(target_enable_umfpack _TARGET_ _SCOPE_) ...@@ -26,11 +26,13 @@ macro(target_enable_umfpack _TARGET_ _SCOPE_)
else (SuiteSparse_FOUND) else (SuiteSparse_FOUND)
# find umfpack manually by searching for umfpack.h header file # find umfpack manually by searching for umfpack.h header file
find_library(UMFPACK_LIBRARY umfpack find_library(UMFPACK_LIBRARY umfpack
HINTS ${AMDIS_UMFPACK_LIB_DIR} ${SUITESPARSE_LIB} $ENV{SUITESPARSE_LIB} HINTS ${AMDIS_UMFPACK_ROOT_DIR}
DOC "Library file for UMFPACK") PATH_PREFIXES lib lib64
DOC "Library file for UMFPACK")
find_file(UMFPACK_H umfpack.h find_file(UMFPACK_H umfpack.h
HINTS ${AMDIS_UMFPACK_INCLUDE_DIR} ${SUITESPARSE_INC} $ENV{SUITESPARSE_INC} ENV CPATH /usr/include /usr/include/suitesparse /usr/include/ufsparse HINTS ${AMDIS_UMFPACK_ROOT_DIR}/include
DOC "Headerfile umfpack.h for UMFPACK") PATHS /usr/include/suitesparse /usr/include/ufsparse
DOC "Headerfile umfpack.h for UMFPACK")
if (UMFPACK_H AND UMFPACK_LIBRARY) if (UMFPACK_H AND UMFPACK_LIBRARY)
get_filename_component(UMFPACK_PATH ${UMFPACK_H} PATH) get_filename_component(UMFPACK_PATH ${UMFPACK_H} PATH)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment