Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
amdis
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
iwr
amdis
Commits
8aa43b17
Commit
8aa43b17
authored
Jan 08, 2019
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update find package umfpack
parent
162e0367
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
AMDiS/cmake3/AMDIS.cmake.in
AMDiS/cmake3/AMDIS.cmake.in
+1
-2
AMDiS/cmake3/target_enable_umfpack.cmake
AMDiS/cmake3/target_enable_umfpack.cmake
+6
-4
No files found.
AMDiS/cmake3/AMDIS.cmake.in
View file @
8aa43b17
...
...
@@ -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
View file @
8aa43b17
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment