Commit 076a7e14 authored by Praetorius, Simon's avatar Praetorius, Simon

cleanup of CMakeLists files for installation of amdis

parent bf054388
Pipeline #955 failed with stage
in 1 minute and 19 seconds
......@@ -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"
......
......@@ -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
......@@ -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")
......@@ -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)
#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
......
......@@ -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")
......@@ -22,3 +22,5 @@ install(FILES
SystemVector.hpp
UmfpackRunner.hpp
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis/linear_algebra/mtl)
add_subdirectory("itl")
......@@ -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>
......
......@@ -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>
......
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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment