Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nils-Arne Dreier
dune-common
Commits
0f12caff
Commit
0f12caff
authored
9 years ago
by
Christoph Grüninger
Browse files
Options
Downloads
Patches
Plain Diff
[cleanup] Remove enable trick for UMFPack
parent
d75c3a46
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmake/modules/AddUMFPackFlags.cmake
+4
-3
4 additions, 3 deletions
cmake/modules/AddUMFPackFlags.cmake
cmake/modules/FindUMFPack.cmake
+3
-3
3 additions, 3 deletions
cmake/modules/FindUMFPack.cmake
config.h.cmake
+2
-2
2 additions, 2 deletions
config.h.cmake
with
9 additions
and
8 deletions
cmake/modules/AddUMFPackFlags.cmake
+
4
−
3
View file @
0f12caff
# module providing convenience mehtods for compiling bianries with UMFPack support
# module providing convenience methods for compiling
# binaries with UMFPack support
#
# Provides the following functions:
#
...
...
@@ -12,7 +13,7 @@ function(add_dune_umfpack_flags _targets)
get_target_property
(
_props
${
_target
}
COMPILE_FLAGS
)
string
(
REPLACE
"_props-NOTFOUND"
""
_props
"
${
_props
}
"
)
set_target_properties
(
${
_target
}
PROPERTIES COMPILE_FLAGS
"
${
_props
}
${
UMFPACK_DUNE_COMPILE_FLAGS
}
-DENABLE_UMFPACK
"
)
"
${
_props
}
${
UMFPACK_DUNE_COMPILE_FLAGS
}
"
)
endforeach
(
_target
${
_targets
}
)
endif
(
UMFPACK_FOUND
)
endfunction
(
add_dune_umfpack_flags
)
\ No newline at end of file
endfunction
(
add_dune_umfpack_flags
)
This diff is collapsed.
Click to expand it.
cmake/modules/FindUMFPack.cmake
+
3
−
3
View file @
0f12caff
...
...
@@ -96,7 +96,7 @@ set(HAVE_UMFPACK ${UMFPACK_FOUND})
# register all umfpack related flags
if
(
UMFPACK_FOUND
)
dune_register_package_flags
(
COMPILE_DEFINITIONS
"ENABLE_UMFPACK=1"
LIBRARIES
"
${
UMFPACK_LIBRARIES
}
"
INCLUDE_DIRS
"
${
UMFPACK_INCLUDE_DIRS
}
"
)
dune_register_package_flags
(
LIBRARIES
"
${
UMFPACK_LIBRARIES
}
"
INCLUDE_DIRS
"
${
UMFPACK_INCLUDE_DIRS
}
"
)
endif
()
This diff is collapsed.
Click to expand it.
config.h.cmake
+
2
−
2
View file @
0f12caff
...
...
@@ -107,8 +107,8 @@
/* does the compiler support the keyword 'final'? */
#cmakedefine HAVE_KEYWORD_FINAL 1
/* Define to if the UMFPack library is available */
#cmakedefine HAVE_UMFPACK
ENABLE_UMFPACK
/* Define to
1
if the UMFPack library is available */
#cmakedefine HAVE_UMFPACK
1
/* Define to ENABLE_PARMETIS if you have the Parmetis library.
This is only true if MPI was found
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment