update find package umfpack

AMDiS/cmake3/AMDIS.cmake.in

@@ -78,8 +78,7 @@ target_enable_boost(amdis_base INTERFACE ON)
 # --------------------
 if (AMDIS_NEED_UMFPACK)
   set(AMDIS_SuiteSparse_DIR @SuiteSparse_DIR@)
-  set(AMDIS_UMFPACK_INCLUDE_DIR @UMFPACK_INCLUDE_DIRS@)
-  set(AMDIS_UMFPACK_LIB_DIR ${AMDIS_UMFPACK_INCLUDE_DIR}/../include)
+  set(AMDIS_UMFPACK_ROOT_DIR @UMFPACK_INCLUDE_DIRS@/..)
   target_enable_umfpack(amdis_base INTERFACE ON)
 endif (AMDIS_NEED_UMFPACK)
 

AMDiS/cmake3/target_enable_umfpack.cmake

@@ -26,11 +26,13 @@ macro(target_enable_umfpack _TARGET_ _SCOPE_)
     else (SuiteSparse_FOUND)
         # find umfpack manually by searching for umfpack.h header file
         find_library(UMFPACK_LIBRARY umfpack
-            HINTS ${AMDIS_UMFPACK_LIB_DIR} ${SUITESPARSE_LIB} $ENV{SUITESPARSE_LIB}
-            DOC "Library file for UMFPACK")
+		HINTS ${AMDIS_UMFPACK_ROOT_DIR}
+		PATH_PREFIXES lib lib64
+	        DOC "Library file for UMFPACK")
         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
-            DOC "Headerfile umfpack.h for UMFPACK")
+		HINTS ${AMDIS_UMFPACK_ROOT_DIR}/include
+		PATHS /usr/include/suitesparse /usr/include/ufsparse
+	        DOC "Headerfile umfpack.h for UMFPACK")
 
         if (UMFPACK_H AND UMFPACK_LIBRARY)
             get_filename_component(UMFPACK_PATH ${UMFPACK_H} PATH)