From 00bf86247266edb421bc2bc92eda748dbc4a197d Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Tue, 19 Jun 2018 14:41:35 +0200
Subject: [PATCH] [cmake] automatically generate CMakeLists.txt files
Add a corresponding python script `bin/util/create_cmakelists.py`.
Move the folder `bin/moduleutil` to `bin/util`.
Run the script.
---
bin/util/create_cmakelists.py | 33 +++++++++++
bin/{moduleutil => util}/createdockerimage.sh | 0
bin/{moduleutil => util}/extractmodulepart.sh | 4 +-
bin/{moduleutil => util}/getusedversions.sh | 0
dumux/CMakeLists.txt | 25 ++++-----
dumux/adaptive/CMakeLists.txt | 1 -
dumux/assembly/CMakeLists.txt | 2 +-
dumux/common/CMakeLists.txt | 9 ++-
dumux/common/geometry/CMakeLists.txt | 5 +-
dumux/common/properties/CMakeLists.txt | 2 -
dumux/common/typetraits/CMakeLists.txt | 4 +-
dumux/discretization/CMakeLists.txt | 12 +++-
dumux/discretization/box/CMakeLists.txt | 6 +-
.../cellcentered/CMakeLists.txt | 4 +-
.../cellcentered/mpfa/CMakeLists.txt | 4 +-
.../cellcentered/tpfa/CMakeLists.txt | 3 +-
dumux/discretization/staggered/CMakeLists.txt | 2 +-
.../staggered/freeflow/CMakeLists.txt | 7 ++-
dumux/freeflow/CMakeLists.txt | 14 +++--
dumux/freeflow/compositional/CMakeLists.txt | 5 +-
.../compositional/staggered/CMakeLists.txt | 2 -
dumux/freeflow/navierstokes/CMakeLists.txt | 3 +-
.../navierstokes/staggered/CMakeLists.txt | 2 -
dumux/freeflow/nonisothermal/CMakeLists.txt | 3 +-
dumux/freeflow/rans/CMakeLists.txt | 5 +-
dumux/freeflow/rans/twoeq/CMakeLists.txt | 4 +-
.../rans/twoeq/kepsilon/CMakeLists.txt | 4 +-
.../twoeq/kepsilon/staggered/CMakeLists.txt | 1 -
.../rans/twoeq/lowrekepsilon/CMakeLists.txt | 4 +-
.../lowrekepsilon/staggered/CMakeLists.txt | 1 -
dumux/freeflow/rans/zeroeq/CMakeLists.txt | 1 -
dumux/geomechanics/CMakeLists.txt | 4 +-
dumux/io/CMakeLists.txt | 33 +++++++----
dumux/linear/CMakeLists.txt | 1 -
dumux/material/CMakeLists.txt | 23 ++++----
.../binarycoefficients/CMakeLists.txt | 3 +-
dumux/material/chemistry/CMakeLists.txt | 2 +-
.../chemistry/electrochemistry/CMakeLists.txt | 2 -
dumux/material/components/CMakeLists.txt | 8 ++-
.../material/components/iapws/CMakeLists.txt | 2 -
.../material/constraintsolvers/CMakeLists.txt | 2 -
dumux/material/eos/CMakeLists.txt | 2 -
.../fluidmatrixinteractions/1p/CMakeLists.txt | 2 -
.../fluidmatrixinteractions/2p/CMakeLists.txt | 2 -
.../2pia/CMakeLists.txt | 2 -
.../fluidmatrixinteractions/3p/CMakeLists.txt | 2 -
.../fluidmatrixinteractions/CMakeLists.txt | 13 ++---
.../mineralization/CMakeLists.txt | 2 -
.../fluidmatrixinteractions/mp/CMakeLists.txt | 2 -
dumux/material/fluidstates/CMakeLists.txt | 3 +-
dumux/material/fluidsystems/CMakeLists.txt | 42 +++++++-------
dumux/material/solidstates/CMakeLists.txt | 5 +-
dumux/material/solidsystems/CMakeLists.txt | 4 +-
dumux/material/spatialparams/CMakeLists.txt | 4 +-
dumux/nonlinear/CMakeLists.txt | 3 +-
dumux/parallel/CMakeLists.txt | 2 -
dumux/porousmediumflow/1p/CMakeLists.txt | 5 +-
.../1p/sequential/CMakeLists.txt | 7 +--
.../1p/sequential/diffusion/CMakeLists.txt | 3 +-
.../diffusion/cellcentered/CMakeLists.txt | 2 -
dumux/porousmediumflow/1pnc/CMakeLists.txt | 2 -
dumux/porousmediumflow/1pncmin/CMakeLists.txt | 1 -
dumux/porousmediumflow/2p/CMakeLists.txt | 3 +-
.../2p/sequential/CMakeLists.txt | 13 ++---
.../2p/sequential/diffusion/CMakeLists.txt | 7 +--
.../diffusion/cellcentered/CMakeLists.txt | 8 +--
.../diffusion/mimetic/CMakeLists.txt | 12 ++--
.../sequential/diffusion/mpfa/CMakeLists.txt | 4 +-
.../diffusion/mpfa/lmethod/CMakeLists.txt | 20 +++----
.../diffusion/mpfa/omethod/CMakeLists.txt | 2 -
.../2p/sequential/impes/CMakeLists.txt | 4 +-
.../2p/sequential/transport/CMakeLists.txt | 3 +-
.../transport/cellcentered/CMakeLists.txt | 20 +++----
dumux/porousmediumflow/2p1c/CMakeLists.txt | 2 -
dumux/porousmediumflow/2p2c/CMakeLists.txt | 5 +-
.../2p2c/sequential/CMakeLists.txt | 10 ++--
dumux/porousmediumflow/2pnc/CMakeLists.txt | 2 -
dumux/porousmediumflow/2pncmin/CMakeLists.txt | 2 -
dumux/porousmediumflow/3p/CMakeLists.txt | 2 -
dumux/porousmediumflow/3p3c/CMakeLists.txt | 2 -
.../3pwateroil/CMakeLists.txt | 2 -
dumux/porousmediumflow/CMakeLists.txt | 55 +++++++++++--------
dumux/porousmediumflow/boxdfm/CMakeLists.txt | 3 +-
dumux/porousmediumflow/co2/CMakeLists.txt | 3 +-
.../compositional/CMakeLists.txt | 5 +-
.../immiscible/CMakeLists.txt | 3 +-
.../mineralization/CMakeLists.txt | 3 +-
dumux/porousmediumflow/mpnc/CMakeLists.txt | 1 -
.../nonequilibrium/CMakeLists.txt | 10 ++--
.../nonequilibrium/thermal/CMakeLists.txt | 4 +-
.../nonisothermal/CMakeLists.txt | 3 +-
.../porousmediumflow/richards/CMakeLists.txt | 4 +-
.../richardsnc/CMakeLists.txt | 2 -
.../sequential/CMakeLists.txt | 9 ++-
.../sequential/cellcentered/CMakeLists.txt | 5 +-
.../cellcentered/mpfa/CMakeLists.txt | 10 ++--
.../sequential/mimetic/CMakeLists.txt | 2 -
dumux/porousmediumflow/tracer/CMakeLists.txt | 4 +-
98 files changed, 297 insertions(+), 314 deletions(-)
create mode 100644 bin/util/create_cmakelists.py
rename bin/{moduleutil => util}/createdockerimage.sh (100%)
rename bin/{moduleutil => util}/extractmodulepart.sh (99%)
rename bin/{moduleutil => util}/getusedversions.sh (100%)
diff --git a/bin/util/create_cmakelists.py b/bin/util/create_cmakelists.py
new file mode 100644
index 0000000000..141334def2
--- /dev/null
+++ b/bin/util/create_cmakelists.py
@@ -0,0 +1,33 @@
+# Import the os module, for the os.walk function
+import os
+import re
+
+# Set the directory you want to start from
+rootDir = '.'
+for folderName, subFolders, files in os.walk(rootDir):
+ subFolders = sorted(subFolders)
+ files = sorted(files)
+
+ cmakelists = open(folderName + "/CMakeLists.txt", "w")
+
+ for subFolder in subFolders:
+ cmakelists.write("add_subdirectory(\"%s\")\n" % subFolder)
+
+ headersExist = False
+ for fileName in files:
+ if fileName != "CMakeLists.txt":
+ headersExist = True
+ break
+
+ if headersExist:
+ if subFolders:
+ cmakelists.write("\n")
+
+ cmakelists.write("install(FILES\n")
+
+ for fileName in files:
+ if fileName != "CMakeLists.txt":
+ cmakelists.write("%s\n" % fileName)
+
+ cmakelists.write("DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/%s)\n" % folderName[2:])
+ cmakelists.close()
diff --git a/bin/moduleutil/createdockerimage.sh b/bin/util/createdockerimage.sh
similarity index 100%
rename from bin/moduleutil/createdockerimage.sh
rename to bin/util/createdockerimage.sh
diff --git a/bin/moduleutil/extractmodulepart.sh b/bin/util/extractmodulepart.sh
similarity index 99%
rename from bin/moduleutil/extractmodulepart.sh
rename to bin/util/extractmodulepart.sh
index 9471bdd4cb..b2cea16448 100755
--- a/bin/moduleutil/extractmodulepart.sh
+++ b/bin/util/extractmodulepart.sh
@@ -174,7 +174,7 @@ while test "$LAST_REQUIRED_HEADERS" != "$REQUIRED_HEADERS"; do
cd $(dirname $INCLUDED_HEADER_WITH_PATH)
HEADER_FULL_PATH=$(pwd)
HEADER_RELATIVE_PATH=${HEADER_FULL_PATH#$MODULE_FULL_PATH}
- HEADER_RELATIVE_PATH=$(echo $HEADER_RELATIVE_PATH | sed 's/^.//')
+ HEADER_RELATIVE_PATH=$(echo $HEADER_RELATIVE_PATH | sed 's/^.//')
INCLUDED_HEADER_WITH_PATH="${HEADER_RELATIVE_PATH}/${INCLUDED_BASE_NAME}"
cd $MODULE_FULL_PATH
echo "$INCLUDED_HEADER_WITH_PATH" >> tmp_header_file
@@ -193,7 +193,7 @@ rm -f tmp_header_file
echo ""
echo -n "Number of required headers: "
echo "$REQUIRED_HEADERS" | wc -w
-for HEADER in $REQUIRED_HEADERS; do
+for HEADER in $REQUIRED_HEADERS; do
echo $HEADER
rsync -R $HEADER ../$MODULE_NAME
done
diff --git a/bin/moduleutil/getusedversions.sh b/bin/util/getusedversions.sh
similarity index 100%
rename from bin/moduleutil/getusedversions.sh
rename to bin/util/getusedversions.sh
diff --git a/dumux/CMakeLists.txt b/dumux/CMakeLists.txt
index 61918c6fcf..2f0ad3bee0 100644
--- a/dumux/CMakeLists.txt
+++ b/dumux/CMakeLists.txt
@@ -1,13 +1,12 @@
-add_subdirectory("adaptive")
-add_subdirectory("assembly")
-add_subdirectory("common")
-add_subdirectory("discretization")
-add_subdirectory("geomechanics")
-add_subdirectory("freeflow")
-add_subdirectory("io")
-add_subdirectory("linear")
-add_subdirectory("material")
-#add_subdirectory("mixeddimension")
-add_subdirectory("nonlinear")
-add_subdirectory("parallel")
-add_subdirectory("porousmediumflow")
+add_subdirectory(adaptive)
+add_subdirectory(assembly)
+add_subdirectory(common)
+add_subdirectory(discretization)
+add_subdirectory(freeflow)
+add_subdirectory(geomechanics)
+add_subdirectory(io)
+add_subdirectory(linear)
+add_subdirectory(material)
+add_subdirectory(nonlinear)
+add_subdirectory(parallel)
+add_subdirectory(porousmediumflow)
diff --git a/dumux/adaptive/CMakeLists.txt b/dumux/adaptive/CMakeLists.txt
index 5f56a25371..5dbeab8bcc 100644
--- a/dumux/adaptive/CMakeLists.txt
+++ b/dumux/adaptive/CMakeLists.txt
@@ -1,4 +1,3 @@
-#install sources
install(FILES
adapt.hh
griddatatransfer.hh
diff --git a/dumux/assembly/CMakeLists.txt b/dumux/assembly/CMakeLists.txt
index bd2ebb628d..4c77dc4373 100644
--- a/dumux/assembly/CMakeLists.txt
+++ b/dumux/assembly/CMakeLists.txt
@@ -1,4 +1,3 @@
-
install(FILES
boxlocalassembler.hh
boxlocalresidual.hh
@@ -10,6 +9,7 @@ fvassembler.hh
fvlocalassemblerbase.hh
fvlocalresidual.hh
jacobianpattern.hh
+numericepsilon.hh
partialreassembler.hh
staggeredfvassembler.hh
staggeredlocalassembler.hh
diff --git a/dumux/common/CMakeLists.txt b/dumux/common/CMakeLists.txt
index 71a968c2b8..e7d5753277 100644
--- a/dumux/common/CMakeLists.txt
+++ b/dumux/common/CMakeLists.txt
@@ -1,13 +1,14 @@
-add_subdirectory(properties)
add_subdirectory(geometry)
+add_subdirectory(properties)
+add_subdirectory(typetraits)
-#install headers
install(FILES
balanceequationopts.hh
boundaryconditions.hh
boundaryflag.hh
boundarytypes.hh
boundingboxtree.hh
+defaultmappertraits.hh
defaultusagemessage.hh
dimensionlessnumbers.hh
dumuxmessage.hh
@@ -20,18 +21,20 @@ intrange.hh
loggingparametertree.hh
math.hh
matrixvectorhelper.hh
-optional.hh
numericdifferentiation.hh
+optional.hh
parameters.hh
pointsource.hh
properties.hh
quad.hh
reorderingdofmapper.hh
+reservedblockvector.hh
spline.hh
splinecommon_.hh
staggeredfvproblem.hh
start.hh
tabulated2dfunction.hh
+timeloop.hh
timemanager.hh
valgrind.hh
variablelengthspline_.hh
diff --git a/dumux/common/geometry/CMakeLists.txt b/dumux/common/geometry/CMakeLists.txt
index 252f84e8e9..25d3a6a071 100644
--- a/dumux/common/geometry/CMakeLists.txt
+++ b/dumux/common/geometry/CMakeLists.txt
@@ -1,10 +1,11 @@
-
-#install headers
install(FILES
boundingboxtree.hh
boundingboxtreeintersection.hh
geometricentityset.hh
+geometryintersection.hh
+grahamconvexhull.hh
intersectingentities.hh
intersectspointgeometry.hh
intersectspointsimplex.hh
+makegeometry.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/common/geometry)
diff --git a/dumux/common/properties/CMakeLists.txt b/dumux/common/properties/CMakeLists.txt
index e60bf0e080..52bf5515f1 100644
--- a/dumux/common/properties/CMakeLists.txt
+++ b/dumux/common/properties/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
grid.hh
model.hh
diff --git a/dumux/common/typetraits/CMakeLists.txt b/dumux/common/typetraits/CMakeLists.txt
index f71dd84a50..6a7f753cad 100644
--- a/dumux/common/typetraits/CMakeLists.txt
+++ b/dumux/common/typetraits/CMakeLists.txt
@@ -1,6 +1,6 @@
-#install headers
install(FILES
+isvalid.hh
matrix.hh
+typetraits.hh
vector.hh
-isvalid.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/common/typetraits)
diff --git a/dumux/discretization/CMakeLists.txt b/dumux/discretization/CMakeLists.txt
index 1db77918ee..a55ac8b0ff 100644
--- a/dumux/discretization/CMakeLists.txt
+++ b/dumux/discretization/CMakeLists.txt
@@ -1,10 +1,12 @@
-add_subdirectory("box")
-add_subdirectory("cellcentered")
-add_subdirectory("staggered")
+add_subdirectory(box)
+add_subdirectory(cellcentered)
+add_subdirectory(staggered)
install(FILES
basefvgridgeometry.hh
darcyslaw.hh
+effectivestresslaw.hh
+elementsolution.hh
evalgradients.hh
evalsolution.hh
fickslaw.hh
@@ -12,8 +14,12 @@ fluxstencil.hh
fluxvariablesbase.hh
fluxvariablescaching.hh
fourierslaw.hh
+fourierslawnonequilibrium.hh
fvgridvariables.hh
fvproperties.hh
+hookeslaw.hh
+localview.hh
+maxwellstefanslaw.hh
methods.hh
scvandscvfiterators.hh
stationaryvelocityfield.hh
diff --git a/dumux/discretization/box/CMakeLists.txt b/dumux/discretization/box/CMakeLists.txt
index 4e70dc703d..4f630fb250 100644
--- a/dumux/discretization/box/CMakeLists.txt
+++ b/dumux/discretization/box/CMakeLists.txt
@@ -1,17 +1,21 @@
-
install(FILES
boxgeometryhelper.hh
darcyslaw.hh
+effectivestresslaw.hh
elementboundarytypes.hh
elementfluxvariablescache.hh
elementsolution.hh
elementvolumevariables.hh
fickslaw.hh
+fluxvariablescache.hh
fourierslaw.hh
+fourierslawnonequilibrium.hh
fvelementgeometry.hh
fvgridgeometry.hh
gridfluxvariablescache.hh
gridvolumevariables.hh
+hookeslaw.hh
+maxwellstefanslaw.hh
properties.hh
scvftoscvboundarytypes.hh
subcontrolvolume.hh
diff --git a/dumux/discretization/cellcentered/CMakeLists.txt b/dumux/discretization/cellcentered/CMakeLists.txt
index 0e7f879f9b..2875cef25e 100644
--- a/dumux/discretization/cellcentered/CMakeLists.txt
+++ b/dumux/discretization/cellcentered/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_subdirectory("tpfa")
-add_subdirectory("mpfa")
+add_subdirectory(mpfa)
+add_subdirectory(tpfa)
install(FILES
connectivitymap.hh
diff --git a/dumux/discretization/cellcentered/mpfa/CMakeLists.txt b/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
index a77788d00f..d1940659e2 100644
--- a/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
+++ b/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_subdirectory("omethod")
+add_subdirectory(omethod)
install(FILES
computetransmissibility.hh
@@ -12,8 +12,10 @@ fluxvariablescachefiller.hh
fourierslaw.hh
fvelementgeometry.hh
fvgridgeometry.hh
+fvgridgeometrytraits.hh
gridfluxvariablescache.hh
gridinteractionvolumeindexsets.hh
+gridvolumevariables.hh
helper.hh
interactionvolumebase.hh
interactionvolumedatahandle.hh
diff --git a/dumux/discretization/cellcentered/tpfa/CMakeLists.txt b/dumux/discretization/cellcentered/tpfa/CMakeLists.txt
index d26039f556..7ac7f78350 100644
--- a/dumux/discretization/cellcentered/tpfa/CMakeLists.txt
+++ b/dumux/discretization/cellcentered/tpfa/CMakeLists.txt
@@ -1,5 +1,4 @@
install(FILES
-CMakeLists.txt
computetransmissibility.hh
darcyslaw.hh
elementfluxvariablescache.hh
@@ -10,6 +9,8 @@ fourierslaw.hh
fvelementgeometry.hh
fvgridgeometry.hh
gridfluxvariablescache.hh
+gridvolumevariables.hh
+maxwellstefanslaw.hh
properties.hh
subcontrolvolumeface.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/discretization/cellcentered/tpfa)
diff --git a/dumux/discretization/staggered/CMakeLists.txt b/dumux/discretization/staggered/CMakeLists.txt
index a792fb69ba..910de10785 100644
--- a/dumux/discretization/staggered/CMakeLists.txt
+++ b/dumux/discretization/staggered/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_subdirectory("freeflow")
+add_subdirectory(freeflow)
install(FILES
elementfacevariables.hh
diff --git a/dumux/discretization/staggered/freeflow/CMakeLists.txt b/dumux/discretization/staggered/freeflow/CMakeLists.txt
index e8636acf23..89e3125719 100644
--- a/dumux/discretization/staggered/freeflow/CMakeLists.txt
+++ b/dumux/discretization/staggered/freeflow/CMakeLists.txt
@@ -1,12 +1,15 @@
-
install(FILES
boundarytypes.hh
+connectivitymap.hh
+elementvolumevariables.hh
facevariables.hh
fickslaw.hh
fourierslaw.hh
+fvgridgeometrytraits.hh
+gridvolumevariables.hh
maxwellstefanslaw.hh
properties.hh
staggeredgeometryhelper.hh
subcontrolvolumeface.hh
velocityoutput.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/discretization/freeflow)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/discretization/staggered/freeflow)
diff --git a/dumux/freeflow/CMakeLists.txt b/dumux/freeflow/CMakeLists.txt
index 0888d49c5c..318f762168 100644
--- a/dumux/freeflow/CMakeLists.txt
+++ b/dumux/freeflow/CMakeLists.txt
@@ -1,4 +1,10 @@
-add_subdirectory("compositional")
-add_subdirectory("navierstokes")
-add_subdirectory("nonisothermal")
-add_subdirectory("rans")
+add_subdirectory(compositional)
+add_subdirectory(navierstokes)
+add_subdirectory(nonisothermal)
+add_subdirectory(rans)
+
+install(FILES
+properties.hh
+turbulenceproperties.hh
+volumevariables.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/freeflow)
diff --git a/dumux/freeflow/compositional/CMakeLists.txt b/dumux/freeflow/compositional/CMakeLists.txt
index 4be489a570..ddd32e167c 100644
--- a/dumux/freeflow/compositional/CMakeLists.txt
+++ b/dumux/freeflow/compositional/CMakeLists.txt
@@ -1,12 +1,11 @@
-add_subdirectory("staggered")
+add_subdirectory(staggered)
-#install headers
install(FILES
fluxvariables.hh
indices.hh
localresidual.hh
-navierstokesncmodel.hh
lowrekepsilonncmodel.hh
+navierstokesncmodel.hh
volumevariables.hh
vtkoutputfields.hh
zeroeqncmodel.hh
diff --git a/dumux/freeflow/compositional/staggered/CMakeLists.txt b/dumux/freeflow/compositional/staggered/CMakeLists.txt
index 112b4aeb7f..c00b51bc13 100644
--- a/dumux/freeflow/compositional/staggered/CMakeLists.txt
+++ b/dumux/freeflow/compositional/staggered/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
fluxvariables.hh
localresidual.hh
diff --git a/dumux/freeflow/navierstokes/CMakeLists.txt b/dumux/freeflow/navierstokes/CMakeLists.txt
index a00d0a7008..15433fa743 100644
--- a/dumux/freeflow/navierstokes/CMakeLists.txt
+++ b/dumux/freeflow/navierstokes/CMakeLists.txt
@@ -1,6 +1,5 @@
-add_subdirectory("staggered")
+add_subdirectory(staggered)
-#install headers
install(FILES
fluxvariables.hh
fluxvariablescache.hh
diff --git a/dumux/freeflow/navierstokes/staggered/CMakeLists.txt b/dumux/freeflow/navierstokes/staggered/CMakeLists.txt
index d12ae0320a..5d59b30262 100644
--- a/dumux/freeflow/navierstokes/staggered/CMakeLists.txt
+++ b/dumux/freeflow/navierstokes/staggered/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
fluxoversurface.hh
fluxvariables.hh
diff --git a/dumux/freeflow/nonisothermal/CMakeLists.txt b/dumux/freeflow/nonisothermal/CMakeLists.txt
index 1f1856fa57..32acf8d650 100644
--- a/dumux/freeflow/nonisothermal/CMakeLists.txt
+++ b/dumux/freeflow/nonisothermal/CMakeLists.txt
@@ -1,7 +1,6 @@
-
-#install headers
install(FILES
indices.hh
+localresidual.hh
model.hh
vtkoutputfields.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/freeflow/nonisothermal)
diff --git a/dumux/freeflow/rans/CMakeLists.txt b/dumux/freeflow/rans/CMakeLists.txt
index 4aa29042db..86696f58ef 100644
--- a/dumux/freeflow/rans/CMakeLists.txt
+++ b/dumux/freeflow/rans/CMakeLists.txt
@@ -1,7 +1,6 @@
-add_subdirectory("twoeq")
-add_subdirectory("zeroeq")
+add_subdirectory(twoeq)
+add_subdirectory(zeroeq)
-#install headers
install(FILES
model.hh
problem.hh
diff --git a/dumux/freeflow/rans/twoeq/CMakeLists.txt b/dumux/freeflow/rans/twoeq/CMakeLists.txt
index ee8d7de6fc..3778f272e5 100644
--- a/dumux/freeflow/rans/twoeq/CMakeLists.txt
+++ b/dumux/freeflow/rans/twoeq/CMakeLists.txt
@@ -1,2 +1,2 @@
-add_subdirectory("kepsilon")
-add_subdirectory("lowrekepsilon")
+add_subdirectory(kepsilon)
+add_subdirectory(lowrekepsilon)
diff --git a/dumux/freeflow/rans/twoeq/kepsilon/CMakeLists.txt b/dumux/freeflow/rans/twoeq/kepsilon/CMakeLists.txt
index 1f77d858e5..667725cb2d 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/CMakeLists.txt
+++ b/dumux/freeflow/rans/twoeq/kepsilon/CMakeLists.txt
@@ -1,10 +1,10 @@
-#install headers
+add_subdirectory(staggered)
+
install(FILES
fluxvariables.hh
indices.hh
localresidual.hh
model.hh
-# models.hh
problem.hh
volumevariables.hh
vtkoutputfields.hh
diff --git a/dumux/freeflow/rans/twoeq/kepsilon/staggered/CMakeLists.txt b/dumux/freeflow/rans/twoeq/kepsilon/staggered/CMakeLists.txt
index bbbf90a8c6..1cb45e4c24 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/staggered/CMakeLists.txt
+++ b/dumux/freeflow/rans/twoeq/kepsilon/staggered/CMakeLists.txt
@@ -1,4 +1,3 @@
-#install headers
install(FILES
fluxvariables.hh
localresidual.hh
diff --git a/dumux/freeflow/rans/twoeq/lowrekepsilon/CMakeLists.txt b/dumux/freeflow/rans/twoeq/lowrekepsilon/CMakeLists.txt
index a83eea4953..5d7f7ab243 100644
--- a/dumux/freeflow/rans/twoeq/lowrekepsilon/CMakeLists.txt
+++ b/dumux/freeflow/rans/twoeq/lowrekepsilon/CMakeLists.txt
@@ -1,10 +1,10 @@
-#install headers
+add_subdirectory(staggered)
+
install(FILES
fluxvariables.hh
indices.hh
localresidual.hh
model.hh
-# models.hh
problem.hh
volumevariables.hh
vtkoutputfields.hh
diff --git a/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/CMakeLists.txt b/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/CMakeLists.txt
index ac06a72498..b2f6e23970 100644
--- a/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/CMakeLists.txt
+++ b/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/CMakeLists.txt
@@ -1,4 +1,3 @@
-#install headers
install(FILES
fluxvariables.hh
localresidual.hh
diff --git a/dumux/freeflow/rans/zeroeq/CMakeLists.txt b/dumux/freeflow/rans/zeroeq/CMakeLists.txt
index 24c5d3e332..f73d39dad0 100644
--- a/dumux/freeflow/rans/zeroeq/CMakeLists.txt
+++ b/dumux/freeflow/rans/zeroeq/CMakeLists.txt
@@ -1,4 +1,3 @@
-#install headers
install(FILES
model.hh
problem.hh
diff --git a/dumux/geomechanics/CMakeLists.txt b/dumux/geomechanics/CMakeLists.txt
index 5b4bd9952f..22205305a5 100644
--- a/dumux/geomechanics/CMakeLists.txt
+++ b/dumux/geomechanics/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_subdirectory("elastic")
-add_subdirectory("poroelastic")
+add_subdirectory(elastic)
+add_subdirectory(poroelastic)
install(FILES
fvproblem.hh
diff --git a/dumux/io/CMakeLists.txt b/dumux/io/CMakeLists.txt
index 90e7fdbf25..d617dc5ef7 100644
--- a/dumux/io/CMakeLists.txt
+++ b/dumux/io/CMakeLists.txt
@@ -1,13 +1,22 @@
install(FILES
- adaptivegridrestart.hh
- container.hh
- cpgridcreator.hh
- gnuplotinterface.hh
- gridcreator.hh
- ploteffectivediffusivitymodel.hh
- plotmateriallaw.hh
- plotmateriallaw3p.hh
- plotthermalconductivitymodel.hh
- restart.hh
- vtknestedfunction.hh
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/io)
+adaptivegridrestart.hh
+cakegridcreator.hh
+container.hh
+cpgridcreator.hh
+defaultvtkoutputfields.hh
+gnuplotinterface.hh
+gridcreator.hh
+ploteffectivediffusivitymodel.hh
+plotmateriallaw.hh
+plotmateriallaw3p.hh
+plotthermalconductivitymodel.hh
+pointcloudvtkwriter.hh
+restart.hh
+staggeredvtkoutputmodule.hh
+subgridgridcreator.hh
+vtkfunction.hh
+vtkmultiwriter.hh
+vtknestedfunction.hh
+vtkoutputmodule.hh
+vtksequencewriter.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/io)
diff --git a/dumux/linear/CMakeLists.txt b/dumux/linear/CMakeLists.txt
index 1c70800667..22c6670cfb 100644
--- a/dumux/linear/CMakeLists.txt
+++ b/dumux/linear/CMakeLists.txt
@@ -1,4 +1,3 @@
-#install headers
install(FILES
amgbackend.hh
amgparallelhelpers.hh
diff --git a/dumux/material/CMakeLists.txt b/dumux/material/CMakeLists.txt
index 40cabdc627..43ad7f372f 100644
--- a/dumux/material/CMakeLists.txt
+++ b/dumux/material/CMakeLists.txt
@@ -1,16 +1,15 @@
-add_subdirectory("binarycoefficients")
-add_subdirectory("chemistry")
-add_subdirectory("components")
-add_subdirectory("constraintsolvers")
-add_subdirectory("eos")
-add_subdirectory("fluidmatrixinteractions")
-add_subdirectory("fluidstates")
-add_subdirectory("fluidsystems")
-add_subdirectory("spatialparams")
-add_subdirectory("solidsystems")
-add_subdirectory("solidstates")
+add_subdirectory(binarycoefficients)
+add_subdirectory(chemistry)
+add_subdirectory(components)
+add_subdirectory(constraintsolvers)
+add_subdirectory(eos)
+add_subdirectory(fluidmatrixinteractions)
+add_subdirectory(fluidstates)
+add_subdirectory(fluidsystems)
+add_subdirectory(solidstates)
+add_subdirectory(solidsystems)
+add_subdirectory(spatialparams)
-#install headers
install(FILES
constants.hh
idealgas.hh
diff --git a/dumux/material/binarycoefficients/CMakeLists.txt b/dumux/material/binarycoefficients/CMakeLists.txt
index 488f662214..b0dfe4b88f 100644
--- a/dumux/material/binarycoefficients/CMakeLists.txt
+++ b/dumux/material/binarycoefficients/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
air_mesitylene.hh
air_xylene.hh
@@ -7,6 +5,7 @@ brine_air.hh
brine_co2.hh
fullermethod.hh
h2o_air.hh
+h2o_ch4.hh
h2o_constant.hh
h2o_heavyoil.hh
h2o_mesitylene.hh
diff --git a/dumux/material/chemistry/CMakeLists.txt b/dumux/material/chemistry/CMakeLists.txt
index 346231785d..bd0aa945c7 100644
--- a/dumux/material/chemistry/CMakeLists.txt
+++ b/dumux/material/chemistry/CMakeLists.txt
@@ -1 +1 @@
-add_subdirectory("electrochemistry")
+add_subdirectory(electrochemistry)
diff --git a/dumux/material/chemistry/electrochemistry/CMakeLists.txt b/dumux/material/chemistry/electrochemistry/CMakeLists.txt
index e38e6c8fd9..f38151d68f 100644
--- a/dumux/material/chemistry/electrochemistry/CMakeLists.txt
+++ b/dumux/material/chemistry/electrochemistry/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
electrochemistry.hh
electrochemistryni.hh
diff --git a/dumux/material/components/CMakeLists.txt b/dumux/material/components/CMakeLists.txt
index 485bc5b4bd..6450b2173e 100644
--- a/dumux/material/components/CMakeLists.txt
+++ b/dumux/material/components/CMakeLists.txt
@@ -1,8 +1,8 @@
-add_subdirectory("iapws")
+add_subdirectory(iapws)
-#install headers
install(FILES
air.hh
+base.hh
benzene.hh
brine.hh
cao.hh
@@ -11,17 +11,21 @@ ch4.hh
co2.hh
co2tablereader.hh
co2tables.inc
+componenttraits.hh
constant.hh
+gas.hh
granite.hh
h2.hh
h2o.hh
heavyoil.hh
+liquid.hh
mesitylene.hh
n2.hh
nacl.hh
o2.hh
simpleco2.hh
simpleh2o.hh
+solid.hh
tabulatedcomponent.hh
trichloroethene.hh
xylene.hh
diff --git a/dumux/material/components/iapws/CMakeLists.txt b/dumux/material/components/iapws/CMakeLists.txt
index a7129275ab..1d489e0751 100644
--- a/dumux/material/components/iapws/CMakeLists.txt
+++ b/dumux/material/components/iapws/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
common.hh
region1.hh
diff --git a/dumux/material/constraintsolvers/CMakeLists.txt b/dumux/material/constraintsolvers/CMakeLists.txt
index e7d03978dc..0b165391a3 100644
--- a/dumux/material/constraintsolvers/CMakeLists.txt
+++ b/dumux/material/constraintsolvers/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
compositionalflash.hh
compositionfromfugacities.hh
diff --git a/dumux/material/eos/CMakeLists.txt b/dumux/material/eos/CMakeLists.txt
index f9ffed4fcf..9166d44fec 100644
--- a/dumux/material/eos/CMakeLists.txt
+++ b/dumux/material/eos/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
pengrobinson.hh
pengrobinsonmixture.hh
diff --git a/dumux/material/fluidmatrixinteractions/1p/CMakeLists.txt b/dumux/material/fluidmatrixinteractions/1p/CMakeLists.txt
index 6ce4782dde..35a5ae5255 100644
--- a/dumux/material/fluidmatrixinteractions/1p/CMakeLists.txt
+++ b/dumux/material/fluidmatrixinteractions/1p/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
thermalconductivityaverage.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/fluidmatrixinteractions/1p)
diff --git a/dumux/material/fluidmatrixinteractions/2p/CMakeLists.txt b/dumux/material/fluidmatrixinteractions/2p/CMakeLists.txt
index 05bb74d80e..6f6255385f 100644
--- a/dumux/material/fluidmatrixinteractions/2p/CMakeLists.txt
+++ b/dumux/material/fluidmatrixinteractions/2p/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
brookscorey.hh
brookscoreyparams.hh
diff --git a/dumux/material/fluidmatrixinteractions/2pia/CMakeLists.txt b/dumux/material/fluidmatrixinteractions/2pia/CMakeLists.txt
index 589bd97299..4040d3bc88 100644
--- a/dumux/material/fluidmatrixinteractions/2pia/CMakeLists.txt
+++ b/dumux/material/fluidmatrixinteractions/2pia/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
awnsurfaceexpfct.hh
awnsurfaceexpfctparams.hh
diff --git a/dumux/material/fluidmatrixinteractions/3p/CMakeLists.txt b/dumux/material/fluidmatrixinteractions/3p/CMakeLists.txt
index 7d5371e22a..63d05e3b03 100644
--- a/dumux/material/fluidmatrixinteractions/3p/CMakeLists.txt
+++ b/dumux/material/fluidmatrixinteractions/3p/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
efftoabslaw.hh
efftoabslawparams.hh
diff --git a/dumux/material/fluidmatrixinteractions/CMakeLists.txt b/dumux/material/fluidmatrixinteractions/CMakeLists.txt
index 72b92a7451..a7cb05704f 100644
--- a/dumux/material/fluidmatrixinteractions/CMakeLists.txt
+++ b/dumux/material/fluidmatrixinteractions/CMakeLists.txt
@@ -1,11 +1,10 @@
-add_subdirectory("1p")
-add_subdirectory("2p")
-add_subdirectory("2pia")
-add_subdirectory("3p")
-add_subdirectory("mp")
-add_subdirectory("mineralization")
+add_subdirectory(1p)
+add_subdirectory(2p)
+add_subdirectory(2pia)
+add_subdirectory(3p)
+add_subdirectory(mineralization)
+add_subdirectory(mp)
-#install headers
install(FILES
diffusivityconstanttortuosity.hh
diffusivitymillingtonquirk.hh
diff --git a/dumux/material/fluidmatrixinteractions/mineralization/CMakeLists.txt b/dumux/material/fluidmatrixinteractions/mineralization/CMakeLists.txt
index 6034e22bf8..a35494f0e5 100644
--- a/dumux/material/fluidmatrixinteractions/mineralization/CMakeLists.txt
+++ b/dumux/material/fluidmatrixinteractions/mineralization/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
effectivesoliddensity.hh
effectivesolidheatcapacity.hh
diff --git a/dumux/material/fluidmatrixinteractions/mp/CMakeLists.txt b/dumux/material/fluidmatrixinteractions/mp/CMakeLists.txt
index 6d920f7c34..1e3eda3176 100644
--- a/dumux/material/fluidmatrixinteractions/mp/CMakeLists.txt
+++ b/dumux/material/fluidmatrixinteractions/mp/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
2padapter.hh
2poftadapter.hh
diff --git a/dumux/material/fluidstates/CMakeLists.txt b/dumux/material/fluidstates/CMakeLists.txt
index 7dfb611501..e331e3367a 100644
--- a/dumux/material/fluidstates/CMakeLists.txt
+++ b/dumux/material/fluidstates/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
2p2c.hh
compositional.hh
@@ -9,6 +7,7 @@ nonequilibrium.hh
nonequilibriumenergy.hh
nonequilibriummass.hh
pressureoverlay.hh
+pseudo1p2c.hh
saturationoverlay.hh
temperatureoverlay.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/fluidstates)
diff --git a/dumux/material/fluidsystems/CMakeLists.txt b/dumux/material/fluidsystems/CMakeLists.txt
index 3b5f1e5c86..6a0a87ff75 100644
--- a/dumux/material/fluidsystems/CMakeLists.txt
+++ b/dumux/material/fluidsystems/CMakeLists.txt
@@ -1,22 +1,22 @@
install(FILES
- 1pgas.hh
- 1pliquid.hh
- 2p1c.hh
- 2pimmiscible.hh
- 3pimmiscible.hh
- base.hh
- brineair.hh
- brineco2.hh
- h2oair.hh
- h2oairmesitylene.hh
- h2oairxylene.hh
- h2oheavyoil.hh
- h2on2.hh
- h2on2kinetic.hh
- h2on2o2.hh
- liquidphase2c.hh
- nullparametercache.hh
- parametercachebase.hh
- spe5.hh
- spe5parametercache.hh
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/fluidsystems)
+1pgas.hh
+1pliquid.hh
+2p1c.hh
+2pimmiscible.hh
+3pimmiscible.hh
+base.hh
+brineair.hh
+brineco2.hh
+h2oair.hh
+h2oairmesitylene.hh
+h2oairxylene.hh
+h2oheavyoil.hh
+h2on2.hh
+h2on2kinetic.hh
+h2on2o2.hh
+liquidphase2c.hh
+nullparametercache.hh
+parametercachebase.hh
+spe5.hh
+spe5parametercache.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/fluidsystems)
diff --git a/dumux/material/solidstates/CMakeLists.txt b/dumux/material/solidstates/CMakeLists.txt
index c8ae25cb3a..6e1e0d51cb 100644
--- a/dumux/material/solidstates/CMakeLists.txt
+++ b/dumux/material/solidstates/CMakeLists.txt
@@ -1,6 +1,5 @@
-#install headers
install(FILES
-updatesolidvolumefractions.hh
-inertsolidstate.hh
compositionalsolidstate.hh
+inertsolidstate.hh
+updatesolidvolumefractions.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/solidstates)
diff --git a/dumux/material/solidsystems/CMakeLists.txt b/dumux/material/solidsystems/CMakeLists.txt
index 0e9afac559..094b28793d 100644
--- a/dumux/material/solidsystems/CMakeLists.txt
+++ b/dumux/material/solidsystems/CMakeLists.txt
@@ -1,4 +1,4 @@
install(FILES
- inertsolidphase.hh
- compositionalsolidphase.hh
+compositionalsolidphase.hh
+inertsolidphase.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/solidsystems)
diff --git a/dumux/material/spatialparams/CMakeLists.txt b/dumux/material/spatialparams/CMakeLists.txt
index bd834d827b..926f002d36 100644
--- a/dumux/material/spatialparams/CMakeLists.txt
+++ b/dumux/material/spatialparams/CMakeLists.txt
@@ -1,8 +1,8 @@
-
-#install headers
install(FILES
fv.hh
fv1p.hh
+fvelastic.hh
+fvporoelastic.hh
gstatrandomfield.hh
sequentialfv.hh
sequentialfv1p.hh
diff --git a/dumux/nonlinear/CMakeLists.txt b/dumux/nonlinear/CMakeLists.txt
index 0bc9109ce1..ce71822168 100644
--- a/dumux/nonlinear/CMakeLists.txt
+++ b/dumux/nonlinear/CMakeLists.txt
@@ -1,6 +1,5 @@
-
-#install headers
install(FILES
newtonconvergencewriter.hh
newtonsolver.hh
+privarswitchnewtonsolver.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/nonlinear)
diff --git a/dumux/parallel/CMakeLists.txt b/dumux/parallel/CMakeLists.txt
index 69ce00ec0d..633c6f71b4 100644
--- a/dumux/parallel/CMakeLists.txt
+++ b/dumux/parallel/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
vertexhandles.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/parallel)
diff --git a/dumux/porousmediumflow/1p/CMakeLists.txt b/dumux/porousmediumflow/1p/CMakeLists.txt
index 4a13cee769..edc4992472 100644
--- a/dumux/porousmediumflow/1p/CMakeLists.txt
+++ b/dumux/porousmediumflow/1p/CMakeLists.txt
@@ -1,9 +1,8 @@
-add_subdirectory("sequential")
+add_subdirectory(sequential)
-#install headers
install(FILES
-indices.hh
incompressiblelocalresidual.hh
+indices.hh
model.hh
volumevariables.hh
vtkoutputfields.hh
diff --git a/dumux/porousmediumflow/1p/sequential/CMakeLists.txt b/dumux/porousmediumflow/1p/sequential/CMakeLists.txt
index f32fc9ec4d..da8412d254 100644
--- a/dumux/porousmediumflow/1p/sequential/CMakeLists.txt
+++ b/dumux/porousmediumflow/1p/sequential/CMakeLists.txt
@@ -1,9 +1,8 @@
-add_subdirectory("diffusion")
+add_subdirectory(diffusion)
-#install headers
install(FILES
-indices.hh
-properties.hh
celldata.hh
fluxdata.hh
+indices.hh
+properties.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/1p/sequential)
diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/CMakeLists.txt b/dumux/porousmediumflow/1p/sequential/diffusion/CMakeLists.txt
index 0e54cefb8b..c7902d29ac 100644
--- a/dumux/porousmediumflow/1p/sequential/diffusion/CMakeLists.txt
+++ b/dumux/porousmediumflow/1p/sequential/diffusion/CMakeLists.txt
@@ -1,6 +1,5 @@
-add_subdirectory("cellcentered")
+add_subdirectory(cellcentered)
-#install headers
install(FILES
problem.hh
properties.hh
diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/CMakeLists.txt b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/CMakeLists.txt
index e341057acd..2b00d11198 100644
--- a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/CMakeLists.txt
+++ b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
pressure.hh
pressureproperties.hh
diff --git a/dumux/porousmediumflow/1pnc/CMakeLists.txt b/dumux/porousmediumflow/1pnc/CMakeLists.txt
index d184cbace7..f9c3797f29 100644
--- a/dumux/porousmediumflow/1pnc/CMakeLists.txt
+++ b/dumux/porousmediumflow/1pnc/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
indices.hh
model.hh
diff --git a/dumux/porousmediumflow/1pncmin/CMakeLists.txt b/dumux/porousmediumflow/1pncmin/CMakeLists.txt
index ab30ea48ad..8a82008362 100644
--- a/dumux/porousmediumflow/1pncmin/CMakeLists.txt
+++ b/dumux/porousmediumflow/1pncmin/CMakeLists.txt
@@ -1,4 +1,3 @@
-#install headers
install(FILES
model.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/1pncmin)
diff --git a/dumux/porousmediumflow/2p/CMakeLists.txt b/dumux/porousmediumflow/2p/CMakeLists.txt
index 10af09f9c6..6811a95879 100644
--- a/dumux/porousmediumflow/2p/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/CMakeLists.txt
@@ -1,6 +1,5 @@
-add_subdirectory("sequential")
+add_subdirectory(sequential)
-#install headers
install(FILES
boxmaterialinterfaceparams.hh
formulation.hh
diff --git a/dumux/porousmediumflow/2p/sequential/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/CMakeLists.txt
index e45b9d4134..6629448f8e 100644
--- a/dumux/porousmediumflow/2p/sequential/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/CMakeLists.txt
@@ -1,12 +1,11 @@
-add_subdirectory("diffusion")
-add_subdirectory("impes")
-add_subdirectory("transport")
+add_subdirectory(diffusion)
+add_subdirectory(impes)
+add_subdirectory(transport)
-#install headers
install(FILES
-indices.hh
-properties.hh
-celldataadaptive.hh
celldata.hh
+celldataadaptive.hh
fluxdata.hh
+indices.hh
+properties.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/sequential)
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/diffusion/CMakeLists.txt
index 9e28061579..3cb85f0eac 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/CMakeLists.txt
@@ -1,8 +1,7 @@
-add_subdirectory("cellcentered")
-add_subdirectory("mpfa")
-add_subdirectory("mimetic")
+add_subdirectory(cellcentered)
+add_subdirectory(mimetic)
+add_subdirectory(mpfa)
-#install headers
install(FILES
problem.hh
properties.hh
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/CMakeLists.txt
index 7f5a27a05d..b8c863a236 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/CMakeLists.txt
@@ -1,11 +1,9 @@
-
-#install headers
install(FILES
-pressureadaptive.hh
pressure.hh
-pressurepropertiesadaptive.hh
+pressureadaptive.hh
pressureproperties.hh
+pressurepropertiesadaptive.hh
pressurevelocity.hh
-velocityadaptive.hh
velocity.hh
+velocityadaptive.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered)
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/CMakeLists.txt
index 309c47d3c5..9de8a6efba 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/CMakeLists.txt
@@ -1,15 +1,13 @@
-
-#install headers
install(FILES
-croperatoradaptive.hh
croperator.hh
+croperatoradaptive.hh
localstiffness.hh
-mimeticadaptive.hh
mimetic.hh
-operatoradaptive.hh
+mimeticadaptive.hh
operator.hh
-pressureadaptive.hh
+operatoradaptive.hh
pressure.hh
-pressurepropertiesadaptive.hh
+pressureadaptive.hh
pressureproperties.hh
+pressurepropertiesadaptive.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/sequential/diffusion/mimetic)
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/CMakeLists.txt
index 6a6fefac95..32d2640c27 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/CMakeLists.txt
@@ -1,2 +1,2 @@
-add_subdirectory("lmethod")
-add_subdirectory("omethod")
+add_subdirectory(lmethod)
+add_subdirectory(omethod)
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/CMakeLists.txt
index fbaffbdc06..15e4754200 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/CMakeLists.txt
@@ -1,24 +1,22 @@
-
-#install headers
install(FILES
-2dpressureadaptive.hh
2dpressure.hh
-2dpressurepropertiesadaptive.hh
+2dpressureadaptive.hh
2dpressureproperties.hh
-2dpressurevelocityadaptive.hh
+2dpressurepropertiesadaptive.hh
2dpressurevelocity.hh
+2dpressurevelocityadaptive.hh
2dtransmissibilitycalculator.hh
-2dvelocityadaptive.hh
2dvelocity.hh
-3dinteractionvolumecontaineradaptive.hh
+2dvelocityadaptive.hh
3dinteractionvolumecontainer.hh
-3dpressureadaptive.hh
+3dinteractionvolumecontaineradaptive.hh
3dpressure.hh
-3dpressurepropertiesadaptive.hh
+3dpressureadaptive.hh
3dpressureproperties.hh
-3dpressurevelocityadaptive.hh
+3dpressurepropertiesadaptive.hh
3dpressurevelocity.hh
+3dpressurevelocityadaptive.hh
3dtransmissibilitycalculator.hh
-3dvelocityadaptive.hh
3dvelocity.hh
+3dvelocityadaptive.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod)
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/CMakeLists.txt
index 68679f8227..520a0f412f 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
2dpressure.hh
2dpressureproperties.hh
diff --git a/dumux/porousmediumflow/2p/sequential/impes/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/impes/CMakeLists.txt
index 40662e9bf2..fe8706c5e3 100644
--- a/dumux/porousmediumflow/2p/sequential/impes/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/impes/CMakeLists.txt
@@ -1,9 +1,7 @@
-
-#install headers
install(FILES
gridadaptionindicator.hh
gridadaptionindicatorlocal.hh
problem.hh
-propertiesadaptive.hh
properties.hh
+propertiesadaptive.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/sequential/impes)
diff --git a/dumux/porousmediumflow/2p/sequential/transport/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/transport/CMakeLists.txt
index ce742a4fd6..c24bf02584 100644
--- a/dumux/porousmediumflow/2p/sequential/transport/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/transport/CMakeLists.txt
@@ -1,6 +1,5 @@
-add_subdirectory("cellcentered")
+add_subdirectory(cellcentered)
-#install headers
install(FILES
problem.hh
properties.hh
diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/CMakeLists.txt
index a1c78599e6..67e8ace766 100644
--- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/CMakeLists.txt
@@ -1,11 +1,11 @@
install(FILES
- capillarydiffusion.hh
- convectivepart.hh
- diffusivepart.hh
- evalcflflux.hh
- evalcflfluxcoats.hh
- evalcflfluxdefault.hh
- gravitypart.hh
- properties.hh
- saturation.hh
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/sequential/transport/cellcentered)
+capillarydiffusion.hh
+convectivepart.hh
+diffusivepart.hh
+evalcflflux.hh
+evalcflfluxcoats.hh
+evalcflfluxdefault.hh
+gravitypart.hh
+properties.hh
+saturation.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/sequential/transport/cellcentered)
diff --git a/dumux/porousmediumflow/2p1c/CMakeLists.txt b/dumux/porousmediumflow/2p1c/CMakeLists.txt
index 7c90527afb..baeae729c0 100644
--- a/dumux/porousmediumflow/2p1c/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p1c/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
darcyslaw.hh
indices.hh
diff --git a/dumux/porousmediumflow/2p2c/CMakeLists.txt b/dumux/porousmediumflow/2p2c/CMakeLists.txt
index fafacd7528..16a722b085 100644
--- a/dumux/porousmediumflow/2p2c/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p2c/CMakeLists.txt
@@ -1,10 +1,9 @@
-add_subdirectory("sequential")
+add_subdirectory(sequential)
-#install headers
install(FILES
indices.hh
model.hh
primaryvariableswitch.hh
volumevariables.hh
vtkoutputfields.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p2c/implicit)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p2c)
diff --git a/dumux/porousmediumflow/2p2c/sequential/CMakeLists.txt b/dumux/porousmediumflow/2p2c/sequential/CMakeLists.txt
index 2974d84e43..404e8333fe 100644
--- a/dumux/porousmediumflow/2p2c/sequential/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p2c/sequential/CMakeLists.txt
@@ -1,11 +1,7 @@
-
-#install headers
install(FILES
adaptiveproperties.hh
-problem.hh
-properties.hh
-celldataadaptive.hh
celldata.hh
+celldataadaptive.hh
celldatamultiphysics.hh
fluxdata.hh
fv2dpressureadaptive.hh
@@ -14,9 +10,11 @@ fv3dpressureadaptive.hh
fv3dtransportadaptive.hh
fvmpfal3dinteractionvolumecontaineradaptive.hh
fvpressure.hh
-fvpressuremultiphysics.hh
fvpressurecompositional.hh
+fvpressuremultiphysics.hh
fvtransport.hh
fvtransportmultiphysics.hh
+problem.hh
+properties.hh
variableclassadaptive.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p2c/sequential)
diff --git a/dumux/porousmediumflow/2pnc/CMakeLists.txt b/dumux/porousmediumflow/2pnc/CMakeLists.txt
index 81352b781a..755064a2a1 100644
--- a/dumux/porousmediumflow/2pnc/CMakeLists.txt
+++ b/dumux/porousmediumflow/2pnc/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
model.hh
primaryvariableswitch.hh
diff --git a/dumux/porousmediumflow/2pncmin/CMakeLists.txt b/dumux/porousmediumflow/2pncmin/CMakeLists.txt
index 674234de90..93ab4fa2aa 100644
--- a/dumux/porousmediumflow/2pncmin/CMakeLists.txt
+++ b/dumux/porousmediumflow/2pncmin/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
model.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2pncmin)
diff --git a/dumux/porousmediumflow/3p/CMakeLists.txt b/dumux/porousmediumflow/3p/CMakeLists.txt
index 051356e5b0..60147e4f5f 100644
--- a/dumux/porousmediumflow/3p/CMakeLists.txt
+++ b/dumux/porousmediumflow/3p/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
indices.hh
model.hh
diff --git a/dumux/porousmediumflow/3p3c/CMakeLists.txt b/dumux/porousmediumflow/3p3c/CMakeLists.txt
index 71205887e3..5d933338f5 100644
--- a/dumux/porousmediumflow/3p3c/CMakeLists.txt
+++ b/dumux/porousmediumflow/3p3c/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
indices.hh
localresidual.hh
diff --git a/dumux/porousmediumflow/3pwateroil/CMakeLists.txt b/dumux/porousmediumflow/3pwateroil/CMakeLists.txt
index a523daeb20..99c502d405 100644
--- a/dumux/porousmediumflow/3pwateroil/CMakeLists.txt
+++ b/dumux/porousmediumflow/3pwateroil/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
indices.hh
localresidual.hh
diff --git a/dumux/porousmediumflow/CMakeLists.txt b/dumux/porousmediumflow/CMakeLists.txt
index 47d61ae2f2..d4a462d012 100644
--- a/dumux/porousmediumflow/CMakeLists.txt
+++ b/dumux/porousmediumflow/CMakeLists.txt
@@ -1,23 +1,32 @@
-add_subdirectory("1p")
-add_subdirectory("1pnc")
-add_subdirectory("1pncmin")
-add_subdirectory("2p")
-add_subdirectory("2p1c")
-add_subdirectory("2p2c")
-add_subdirectory("2pnc")
-add_subdirectory("2pncmin")
-add_subdirectory("3p")
-add_subdirectory("3pwateroil")
-add_subdirectory("3p3c")
-add_subdirectory("boxdfm")
-add_subdirectory("co2")
-add_subdirectory("compositional")
-add_subdirectory("immiscible")
-add_subdirectory("mineralization")
-add_subdirectory("mpnc")
-add_subdirectory("nonisothermal")
-add_subdirectory("richards")
-add_subdirectory("richardsnc")
-add_subdirectory("sequential")
-add_subdirectory("tracer")
-add_subdirectory("nonequilibrium")
+add_subdirectory(1p)
+add_subdirectory(1pnc)
+add_subdirectory(1pncmin)
+add_subdirectory(2p)
+add_subdirectory(2p1c)
+add_subdirectory(2p2c)
+add_subdirectory(2pnc)
+add_subdirectory(2pncmin)
+add_subdirectory(3p)
+add_subdirectory(3p3c)
+add_subdirectory(3pwateroil)
+add_subdirectory(boxdfm)
+add_subdirectory(co2)
+add_subdirectory(compositional)
+add_subdirectory(immiscible)
+add_subdirectory(mineralization)
+add_subdirectory(mpnc)
+add_subdirectory(nonequilibrium)
+add_subdirectory(nonisothermal)
+add_subdirectory(richards)
+add_subdirectory(richardsnc)
+add_subdirectory(sequential)
+add_subdirectory(tracer)
+
+install(FILES
+fluxvariables.hh
+fluxvariablescache.hh
+problem.hh
+properties.hh
+velocityoutput.hh
+volumevariables.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow)
diff --git a/dumux/porousmediumflow/boxdfm/CMakeLists.txt b/dumux/porousmediumflow/boxdfm/CMakeLists.txt
index e85e576492..25b70289f4 100644
--- a/dumux/porousmediumflow/boxdfm/CMakeLists.txt
+++ b/dumux/porousmediumflow/boxdfm/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
fluxvariablescache.hh
fvelementgeometry.hh
@@ -8,4 +6,5 @@ geometryhelper.hh
model.hh
subcontrolvolume.hh
subcontrolvolumeface.hh
+vtkoutputmodule.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/boxdfm)
diff --git a/dumux/porousmediumflow/co2/CMakeLists.txt b/dumux/porousmediumflow/co2/CMakeLists.txt
index 80c94c2b9f..6427604a77 100644
--- a/dumux/porousmediumflow/co2/CMakeLists.txt
+++ b/dumux/porousmediumflow/co2/CMakeLists.txt
@@ -1,6 +1,5 @@
-
-#install headers
install(FILES
model.hh
+primaryvariableswitch.hh
volumevariables.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/co2)
diff --git a/dumux/porousmediumflow/compositional/CMakeLists.txt b/dumux/porousmediumflow/compositional/CMakeLists.txt
index 11ccea7975..47480589f7 100644
--- a/dumux/porousmediumflow/compositional/CMakeLists.txt
+++ b/dumux/porousmediumflow/compositional/CMakeLists.txt
@@ -1,4 +1,5 @@
-#install headers
install(FILES
+localresidual.hh
primaryvariableswitch.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/compositional)
\ No newline at end of file
+switchableprimaryvariables.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/compositional)
diff --git a/dumux/porousmediumflow/immiscible/CMakeLists.txt b/dumux/porousmediumflow/immiscible/CMakeLists.txt
index e135fd5d78..192e7955c6 100644
--- a/dumux/porousmediumflow/immiscible/CMakeLists.txt
+++ b/dumux/porousmediumflow/immiscible/CMakeLists.txt
@@ -1,4 +1,3 @@
-#install headers
install(FILES
localresidual.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/immiscible)
\ No newline at end of file
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/immiscible)
diff --git a/dumux/porousmediumflow/mineralization/CMakeLists.txt b/dumux/porousmediumflow/mineralization/CMakeLists.txt
index 783fba4a28..aa49033232 100644
--- a/dumux/porousmediumflow/mineralization/CMakeLists.txt
+++ b/dumux/porousmediumflow/mineralization/CMakeLists.txt
@@ -1,7 +1,6 @@
-#install headers
install(FILES
localresidual.hh
model.hh
volumevariables.hh
vtkoutputfields.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/mineralization)
\ No newline at end of file
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/mineralization)
diff --git a/dumux/porousmediumflow/mpnc/CMakeLists.txt b/dumux/porousmediumflow/mpnc/CMakeLists.txt
index b203874496..5d5339c2d9 100644
--- a/dumux/porousmediumflow/mpnc/CMakeLists.txt
+++ b/dumux/porousmediumflow/mpnc/CMakeLists.txt
@@ -1,4 +1,3 @@
-#install headers
install(FILES
indices.hh
localresidual.hh
diff --git a/dumux/porousmediumflow/nonequilibrium/CMakeLists.txt b/dumux/porousmediumflow/nonequilibrium/CMakeLists.txt
index 09252e0484..8f7cd1ff2e 100644
--- a/dumux/porousmediumflow/nonequilibrium/CMakeLists.txt
+++ b/dumux/porousmediumflow/nonequilibrium/CMakeLists.txt
@@ -1,11 +1,11 @@
-add_subdirectory("thermal")
-#install headers
+add_subdirectory(thermal)
+
install(FILES
-localresidual.hh
gridvariables.hh
indices.hh
-volumevariables.hh
-vtkoutputfields.hh
+localresidual.hh
model.hh
newtonsolver.hh
+volumevariables.hh
+vtkoutputfields.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/nonequilibrium)
diff --git a/dumux/porousmediumflow/nonequilibrium/thermal/CMakeLists.txt b/dumux/porousmediumflow/nonequilibrium/thermal/CMakeLists.txt
index cc28c3018c..c471edbd66 100644
--- a/dumux/porousmediumflow/nonequilibrium/thermal/CMakeLists.txt
+++ b/dumux/porousmediumflow/nonequilibrium/thermal/CMakeLists.txt
@@ -1,3 +1,3 @@
install(FILES
- localresidual.hh
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/nonequilibrium)
+localresidual.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/nonequilibrium/thermal)
diff --git a/dumux/porousmediumflow/nonisothermal/CMakeLists.txt b/dumux/porousmediumflow/nonisothermal/CMakeLists.txt
index b290c6e10e..32f9d31575 100644
--- a/dumux/porousmediumflow/nonisothermal/CMakeLists.txt
+++ b/dumux/porousmediumflow/nonisothermal/CMakeLists.txt
@@ -1,8 +1,7 @@
-#install headers
install(FILES
indices.hh
localresidual.hh
model.hh
volumevariables.hh
vtkoutputfields.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/nonisothermal/implicit)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/nonisothermal)
diff --git a/dumux/porousmediumflow/richards/CMakeLists.txt b/dumux/porousmediumflow/richards/CMakeLists.txt
index 199fc1455f..6d50a09b65 100644
--- a/dumux/porousmediumflow/richards/CMakeLists.txt
+++ b/dumux/porousmediumflow/richards/CMakeLists.txt
@@ -1,12 +1,10 @@
-
-#install headers
install(FILES
indices.hh
localresidual.hh
model.hh
newtonsolver.hh
-privarswitchnewtonsolver.hh
primaryvariableswitch.hh
+privarswitchnewtonsolver.hh
volumevariables.hh
vtkoutputfields.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/richards)
diff --git a/dumux/porousmediumflow/richardsnc/CMakeLists.txt b/dumux/porousmediumflow/richardsnc/CMakeLists.txt
index d0a0fa8cb1..a8445ddb45 100644
--- a/dumux/porousmediumflow/richardsnc/CMakeLists.txt
+++ b/dumux/porousmediumflow/richardsnc/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
indices.hh
model.hh
diff --git a/dumux/porousmediumflow/sequential/CMakeLists.txt b/dumux/porousmediumflow/sequential/CMakeLists.txt
index 166bfcc98d..cfa8da3536 100644
--- a/dumux/porousmediumflow/sequential/CMakeLists.txt
+++ b/dumux/porousmediumflow/sequential/CMakeLists.txt
@@ -1,11 +1,10 @@
-add_subdirectory("cellcentered")
-add_subdirectory("mimetic")
+add_subdirectory(cellcentered)
+add_subdirectory(mimetic)
-#install headers
install(FILES
gridadapt.hh
-gridadaptinitializationindicatordefault.hh
gridadaptinitializationindicator.hh
+gridadaptinitializationindicatordefault.hh
gridadaptproperties.hh
impet.hh
impetproblem.hh
@@ -14,6 +13,6 @@ onemodelproblem.hh
pressureproperties.hh
properties.hh
transportproperties.hh
-variableclassadaptive.hh
variableclass.hh
+variableclassadaptive.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/sequential)
diff --git a/dumux/porousmediumflow/sequential/cellcentered/CMakeLists.txt b/dumux/porousmediumflow/sequential/cellcentered/CMakeLists.txt
index cec886a212..6bc707769e 100644
--- a/dumux/porousmediumflow/sequential/cellcentered/CMakeLists.txt
+++ b/dumux/porousmediumflow/sequential/cellcentered/CMakeLists.txt
@@ -1,9 +1,8 @@
-add_subdirectory("mpfa")
+add_subdirectory(mpfa)
-#install headers
install(FILES
pressure.hh
transport.hh
-velocitydefault.hh
velocity.hh
+velocitydefault.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/sequential/cellcentered)
diff --git a/dumux/porousmediumflow/sequential/cellcentered/mpfa/CMakeLists.txt b/dumux/porousmediumflow/sequential/cellcentered/mpfa/CMakeLists.txt
index 5f9b5eece9..437022c50a 100644
--- a/dumux/porousmediumflow/sequential/cellcentered/mpfa/CMakeLists.txt
+++ b/dumux/porousmediumflow/sequential/cellcentered/mpfa/CMakeLists.txt
@@ -1,10 +1,8 @@
-
-#install headers
install(FILES
-properties.hh
-velocityintransport.hh
-linteractionvolume3dadaptive.hh
-linteractionvolume3d.hh
linteractionvolume.hh
+linteractionvolume3d.hh
+linteractionvolume3dadaptive.hh
ointeractionvolume.hh
+properties.hh
+velocityintransport.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/sequential/cellcentered/mpfa)
diff --git a/dumux/porousmediumflow/sequential/mimetic/CMakeLists.txt b/dumux/porousmediumflow/sequential/mimetic/CMakeLists.txt
index 3bff03ce9b..8446f4a5e2 100644
--- a/dumux/porousmediumflow/sequential/mimetic/CMakeLists.txt
+++ b/dumux/porousmediumflow/sequential/mimetic/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-#install headers
install(FILES
properties.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/sequential/mimetic)
diff --git a/dumux/porousmediumflow/tracer/CMakeLists.txt b/dumux/porousmediumflow/tracer/CMakeLists.txt
index d3e973487c..0f17f09b77 100644
--- a/dumux/porousmediumflow/tracer/CMakeLists.txt
+++ b/dumux/porousmediumflow/tracer/CMakeLists.txt
@@ -1,9 +1,7 @@
-
-#install headers
install(FILES
indices.hh
-model.hh
localresidual.hh
+model.hh
volumevariables.hh
vtkoutputfields.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/tracer)
--
GitLab