From 076a7e1479a879871f8599eade9f911c41ca09a8 Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Sat, 20 Jan 2018 18:26:56 +0100
Subject: [PATCH] cleanup of CMakeLists files for installation of amdis
---
CMakeLists.txt | 1 -
dune.module | 2 +-
dune/amdis/CMakeLists.txt | 5 +++--
dune/amdis/assembler/CMakeLists.txt | 2 +-
dune/amdis/common/CMakeLists.txt | 2 +-
dune/amdis/linear_algebra/CMakeLists.txt | 21 ++-----------------
dune/amdis/linear_algebra/mtl/CMakeLists.txt | 2 ++
.../linear_algebra/mtl/ITL_Preconditioner.hpp | 2 +-
dune/amdis/linear_algebra/mtl/ITL_Solver.hpp | 14 ++++++-------
.../linear_algebra/mtl/itl/CMakeLists.txt | 14 +++++++++++++
10 files changed, 32 insertions(+), 33 deletions(-)
create mode 100644 dune/amdis/linear_algebra/mtl/itl/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 610c5f74..55c1d328 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,6 @@ if(NOT (dune-common_DIR OR dune-common_ROOT OR
${PROJECT_BINARY_DIR})
endif()
-
#find dune-common and set the module path
find_package(dune-common REQUIRED)
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules"
diff --git a/dune.module b/dune.module
index 7f0fcd8f..a103d5f0 100644
--- a/dune.module
+++ b/dune.module
@@ -8,4 +8,4 @@ Version: 0.1
Maintainer: simon.praetorius@tu-dresden.de
#depending on
Depends: dune-common dune-geometry dune-localfunctions dune-typetree dune-grid dune-functions
-Suggests: dune-uggrid dune-alugrid dune-foamgrid
+#Suggests: dune-uggrid dune-alugrid dune-foamgrid
diff --git a/dune/amdis/CMakeLists.txt b/dune/amdis/CMakeLists.txt
index a0cfbd89..308cba71 100644
--- a/dune/amdis/CMakeLists.txt
+++ b/dune/amdis/CMakeLists.txt
@@ -35,12 +35,13 @@ install(FILES
LocalAssembler.hpp
LocalAssemblerBase.hpp
Mesh.hpp
+ Operations.hpp
Operators.hpp
Output.hpp
ProblemInstat.hpp
ProblemInstat.inc.hpp
ProblemInstatBase.hpp
- ProblemInterationInterface.hpp
+ ProblemIterationInterface.hpp
ProblemStat.hpp
ProblemStat.inc.hpp
ProblemStatBase.hpp
@@ -55,4 +56,4 @@ add_subdirectory("gridfunctions")
add_subdirectory("io")
add_subdirectory("linear_algebra")
add_subdirectory("operations")
-add_subdirectory("utility")
\ No newline at end of file
+add_subdirectory("utility")
diff --git a/dune/amdis/assembler/CMakeLists.txt b/dune/amdis/assembler/CMakeLists.txt
index fd3abb09..97228e55 100644
--- a/dune/amdis/assembler/CMakeLists.txt
+++ b/dune/amdis/assembler/CMakeLists.txt
@@ -18,4 +18,4 @@ install(FILES
ZeroOrderTestvec.hpp
ZeroOrderTestvecTrial.hpp
ZeroOrderTestvecTrialvec.hpp
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis/operators)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis/assembler)
diff --git a/dune/amdis/common/CMakeLists.txt b/dune/amdis/common/CMakeLists.txt
index fb11b095..a808bc50 100644
--- a/dune/amdis/common/CMakeLists.txt
+++ b/dune/amdis/common/CMakeLists.txt
@@ -1,6 +1,7 @@
#install headers
install(FILES
+ Assigner.hpp
ClonablePtr.hpp
Concepts.hpp
ConceptsBase.hpp
@@ -10,7 +11,6 @@ install(FILES
Loops.hpp
Math.hpp
Mpl.hpp
- Operations.hpp
OptionalDelete.hpp
ScalarTypes.hpp
Timer.hpp
diff --git a/dune/amdis/linear_algebra/CMakeLists.txt b/dune/amdis/linear_algebra/CMakeLists.txt
index 1fdefd5d..7d878c8b 100644
--- a/dune/amdis/linear_algebra/CMakeLists.txt
+++ b/dune/amdis/linear_algebra/CMakeLists.txt
@@ -2,28 +2,11 @@
install(FILES
HierarchicWrapper.hpp
- LinearAlgebraBse.hpp
+ LinearAlgebraBase.hpp
LinearSolverInterface.hpp
PreconditionerInterface.hpp
RunnerInterface.hpp
SolverInfo.hpp
- mtl/BITL_Preconditioner.hpp
- mtl/BITL_Solver.hpp
- mtl/BlockMTLMatrix.hpp
- mtl/BlockMTLVector.hpp
- mtl/Copy.hpp
- mtl/DOFMatrix.hpp
- mtl/DOFVector.hpp
- mtl/ITL_Preconditioner.hpp
- mtl/ITL_Solver.hpp
- mtl/KrylovRunner.hpp
- mtl/LinearSolver.hpp
- mtl/Mapper.hpp
- mtl/MTLDenseVector.hpp
- mtl/Preconditioner.hpp
- mtl/SystemMatrix.hpp
- mtl/SystemVector.hpp
- mtl/UmfpackRunner.hpp
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis/linear_algebra)
-add_subdirectory("mtl")
\ No newline at end of file
+add_subdirectory("mtl")
diff --git a/dune/amdis/linear_algebra/mtl/CMakeLists.txt b/dune/amdis/linear_algebra/mtl/CMakeLists.txt
index 490d448f..0e3e8e95 100644
--- a/dune/amdis/linear_algebra/mtl/CMakeLists.txt
+++ b/dune/amdis/linear_algebra/mtl/CMakeLists.txt
@@ -22,3 +22,5 @@ install(FILES
SystemVector.hpp
UmfpackRunner.hpp
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis/linear_algebra/mtl)
+
+add_subdirectory("itl")
diff --git a/dune/amdis/linear_algebra/mtl/ITL_Preconditioner.hpp b/dune/amdis/linear_algebra/mtl/ITL_Preconditioner.hpp
index c5e88cbb..847a55f7 100644
--- a/dune/amdis/linear_algebra/mtl/ITL_Preconditioner.hpp
+++ b/dune/amdis/linear_algebra/mtl/ITL_Preconditioner.hpp
@@ -8,7 +8,7 @@
#include <boost/numeric/itl/pc/ic_0.hpp>
#include <boost/numeric/mtl/vector/assigner.hpp>
-#include "itl/masslumping.hpp"
+#include <dune/amdis/linear_algebra/mtl/itl/masslumping.hpp>
#include <dune/amdis/CreatorMap.hpp>
#include <dune/amdis/linear_algebra/mtl/Preconditioner.hpp>
diff --git a/dune/amdis/linear_algebra/mtl/ITL_Solver.hpp b/dune/amdis/linear_algebra/mtl/ITL_Solver.hpp
index 234e38eb..038a9797 100644
--- a/dune/amdis/linear_algebra/mtl/ITL_Solver.hpp
+++ b/dune/amdis/linear_algebra/mtl/ITL_Solver.hpp
@@ -18,13 +18,13 @@
// #include <boost/numeric/itl/krylov/tfqmr.hpp>
// more solvers defined in AMDiS
-#include "itl/minres.hpp"
-#include "itl/gcr.hpp"
-#include "itl/fgmres.hpp"
-#include "itl/fgmres_householder.hpp"
-#include "itl/gmres2.hpp"
-#include "itl/gmres_householder.hpp"
-#include "itl/preonly.hpp"
+#include <dune/amdis/linear_algebra/mtl/itl/minres.hpp>
+#include <dune/amdis/linear_algebra/mtl/itl/gcr.hpp>
+#include <dune/amdis/linear_algebra/mtl/itl/fgmres.hpp>
+#include <dune/amdis/linear_algebra/mtl/itl/fgmres_householder.hpp>
+#include <dune/amdis/linear_algebra/mtl/itl/gmres2.hpp>
+#include <dune/amdis/linear_algebra/mtl/itl/gmres_householder.hpp>
+#include <dune/amdis/linear_algebra/mtl/itl/preonly.hpp>
#include <dune/amdis/CreatorMap.hpp>
#include <dune/amdis/Initfile.hpp>
diff --git a/dune/amdis/linear_algebra/mtl/itl/CMakeLists.txt b/dune/amdis/linear_algebra/mtl/itl/CMakeLists.txt
new file mode 100644
index 00000000..d9f50282
--- /dev/null
+++ b/dune/amdis/linear_algebra/mtl/itl/CMakeLists.txt
@@ -0,0 +1,14 @@
+install(FILES
+ block_diagonal.hpp
+ details.hpp
+ fgmres_householder.hpp
+ fgmres.hpp
+ gcr.hpp
+ gmres2.hpp
+ gmres_householder.hpp
+ hypre.hpp
+ masslumping.hpp
+ minres.hpp
+ preonly.hpp
+ umfpack2_solve.hpp
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis/linear_algebra/mtl/itl)
--
GitLab