Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-solvers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
agnumpde
dune-solvers
Commits
27edd4e2
Commit
27edd4e2
authored
3 months ago
by
graeser
Browse files
Options
Downloads
Plain Diff
Merge branch 'feature/update-buildsystem-new' into 'master'
[cmake] Update build system See merge request
!82
parents
d5027adb
2c3fc125
Branches
Branches containing commit
No related tags found
1 merge request
!82
[cmake] Update build system
Pipeline
#65687
passed
3 months ago
Stage: .pre
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+15
-3
15 additions, 3 deletions
CMakeLists.txt
dune/solvers/CMakeLists.txt
+4
-6
4 additions, 6 deletions
dune/solvers/CMakeLists.txt
with
19 additions
and
9 deletions
CMakeLists.txt
+
15
−
3
View file @
27edd4e2
cmake_minimum_required
(
VERSION 2.8.6
)
if
(
dune-common_VERSION VERSION_GREATER_EQUAL 2.10.0
)
cmake_minimum_required
(
VERSION 3.16
)
else
()
cmake_minimum_required
(
VERSION 3.13
)
endif
()
project
(
dune-solvers CXX
)
if
(
NOT
(
dune-common_DIR OR dune-common_ROOT OR
...
...
@@ -22,9 +26,17 @@ dune_project()
find_package
(
SuiteSparse OPTIONAL_COMPONENTS UMFPACK
)
include
(
AddSuiteSparseFlags
)
# Create library target and export it as Dune::Solvers
dune_add_library
(
dunesolvers EXPORT_NAME Solvers LINK_LIBRARIES
${
DUNE_LIBS
}
)
dune_register_package_flags
(
LIBRARIES dunesolvers
)
add_subdirectory
(
"dune"
)
add_subdirectory
(
"doc"
)
add_subdirectory
(
"cmake/modules"
)
# finalize the dune project, e.g. generating config.h etc.
finalize_dune_project
(
GENERATE_CONFIG_H_CMAKE
)
if
(
dune-common_VERSION VERSION_GREATER_EQUAL 2.10.0
)
finalize_dune_project
()
else
()
finalize_dune_project
(
GENERATE_CONFIG_H_CMAKE
)
endif
()
This diff is collapsed.
Click to expand it.
dune/solvers/CMakeLists.txt
+
4
−
6
View file @
27edd4e2
dune_add_library
(
"dunesolvers"
iterationsteps/blockgssteps.cc
solvers/criterion.cc
)
dune_register_package_flags
(
LIBRARIES dunesolvers
)
add_subdirectory
(
"common"
)
add_subdirectory
(
"iterationsteps"
)
add_subdirectory
(
"norms"
)
...
...
@@ -12,6 +6,10 @@ add_subdirectory("solvers")
add_subdirectory
(
"test"
)
add_subdirectory
(
"transferoperators"
)
target_sources
(
dunesolvers PRIVATE
iterationsteps/blockgssteps.cc
solvers/criterion.cc
)
install
(
FILES
computeenergy.hh
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/dune/solvers
)
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