From f41218dd858d2d3f0c83cc2f78e73265c64cee12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?=
 <christoph.grueninger@iws.uni-stuttgart.de>
Date: Thu, 29 Sep 2016 14:14:22 +0200
Subject: [PATCH] [cmake] Fix installed headers

---
 dumux/implicit/adaptive/CMakeLists.txt        | 16 ++++----
 dumux/io/CMakeLists.txt                       | 30 +++++++-------
 dumux/material/fluidsystems/CMakeLists.txt    | 40 ++++++++++---------
 .../transport/cellcentered/CMakeLists.txt     | 22 +++++-----
 .../mpnc/implicit/energy/CMakeLists.txt       | 24 +++++------
 .../mpnc/implicit/mass/CMakeLists.txt         | 20 +++++-----
 6 files changed, 73 insertions(+), 79 deletions(-)

diff --git a/dumux/implicit/adaptive/CMakeLists.txt b/dumux/implicit/adaptive/CMakeLists.txt
index e70c0fde35..e3d267f263 100644
--- a/dumux/implicit/adaptive/CMakeLists.txt
+++ b/dumux/implicit/adaptive/CMakeLists.txt
@@ -1,10 +1,8 @@
-
-#install headers
 install(FILES
-adaptationhelper.hh
-gridadapt.hh
-gridadaptindicatordefault.hh
-gridadaptinitializationindicator.hh
-gridadaptproperties.hh
-gridadaptpropertydefaults.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/implicit/adaptive)
+  adaptionhelper.hh
+  gridadapt.hh
+  gridadaptindicatordefault.hh
+  gridadaptinitializationindicator.hh
+  gridadaptproperties.hh
+  gridadaptpropertydefaults.hh
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/implicit/adaptive)
diff --git a/dumux/io/CMakeLists.txt b/dumux/io/CMakeLists.txt
index 4ca95d9412..4109a5969c 100644
--- a/dumux/io/CMakeLists.txt
+++ b/dumux/io/CMakeLists.txt
@@ -1,17 +1,15 @@
-
-#install headers
 install(FILES
-adaptivegridrestart.hh
-artgridcreator.hh
-container.hh
-cpgridcreator.hh
-gnuplotinterface.hh
-gridcreator.hh
-ploteffectivediffusivitymodel.hh
-plotmateriallaw.hh
-plotoverline2d.hh
-plotthermalconductivitymodel.hh
-restart.hh
-vtkmultiwriter.hh
-vtknestedfunction.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/io)
+  adaptivegridrestart.hh
+  artgridcreator.hh
+  container.hh
+  cpgridcreator.hh
+  gnuplotinterface.hh
+  gridcreator.hh
+  ploteffectivediffusivitymodel.hh
+  plotmateriallaw.hh
+  plotmateriallaw3p.hh
+  plotthermalconductivitymodel.hh
+  restart.hh
+  vtkmultiwriter.hh
+  vtknestedfunction.hh
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/io)
diff --git a/dumux/material/fluidsystems/CMakeLists.txt b/dumux/material/fluidsystems/CMakeLists.txt
index 242b83488d..43b27a7c2b 100644
--- a/dumux/material/fluidsystems/CMakeLists.txt
+++ b/dumux/material/fluidsystems/CMakeLists.txt
@@ -1,19 +1,23 @@
-
-#install headers
 install(FILES
-1p.hh
-2pimmiscible.hh
-base.hh
-brineair.hh
-brineco2.hh
-h2oair.hh
-h2oairmesitylene.hh
-h2oairxylene.hh
-h2on2.hh
-h2on2kinetic.hh
-h2on2liquidphase.hh
-h2on2o2.hh
-purewatersimple.hh
-spe5.hh
-spe5parametercache.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/fluidsystems)
+  1p.hh
+  2pimmiscible.hh
+  2pliquidvapor.hh
+  base.hh
+  brineair.hh
+  brineco2.hh
+  defaultcomponents.hh
+  gasphase.hh
+  h2oair.hh
+  h2oairmesitylene.hh
+  h2oairxylene.hh
+  h2oheavyoilfluidsystem.hh
+  h2on2.hh
+  h2on2kinetic.hh
+  h2on2o2.hh
+  liquidphase.hh
+  nullparametercache.hh
+  parametercachebase.hh
+  purewatersimple.hh
+  spe5.hh
+  spe5parametercache.hh
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/fluidsystems)
diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/CMakeLists.txt b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/CMakeLists.txt
index 6b3ce1554a..a1c78599e6 100644
--- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/CMakeLists.txt
@@ -1,13 +1,11 @@
-
-#install headers
 install(FILES
-capillarydiffusion.hh
-convectivepart.hh
-diffusivepart.hh
-evalcflfluxcoats.hh
-evalcflfluxdefault.hh
-evalcflflux.hh
-saturation.hh
-transportproperties.hh
-gravitypart.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/mpnc/implicit/energy/CMakeLists.txt b/dumux/porousmediumflow/mpnc/implicit/energy/CMakeLists.txt
index 0bd8035d94..2a501842a5 100644
--- a/dumux/porousmediumflow/mpnc/implicit/energy/CMakeLists.txt
+++ b/dumux/porousmediumflow/mpnc/implicit/energy/CMakeLists.txt
@@ -1,14 +1,12 @@
-
-#install headers
 install(FILES
-fluxvariablesenergy.hh
-fluxvariablesenergykinetic.hh
-indicesenergy.hh
-indicesenergykinetic.hh
-localresidualenergy.hh
-localresidualenergykinetic.hh
-volumevariablesenergy.hh
-volumevariablesenergykinetic.hh
-vtkwriterenergy.hh
-vtkwriterenergykinetic.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/mpnc/implicit/energy)
+  fluxvariables.hh
+  fluxvariableskinetic.hh
+  indices.hh
+  indiceskinetic.hh
+  localresidual.hh
+  localresidualkinetic.hh
+  volumevariables.hh
+  volumevariableskinetic.hh
+  vtkwriter.hh
+  vtkwriterkinetic.hh
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/mpnc/implicit/energy)
diff --git a/dumux/porousmediumflow/mpnc/implicit/mass/CMakeLists.txt b/dumux/porousmediumflow/mpnc/implicit/mass/CMakeLists.txt
index 93428a29ab..961b0c4a7b 100644
--- a/dumux/porousmediumflow/mpnc/implicit/mass/CMakeLists.txt
+++ b/dumux/porousmediumflow/mpnc/implicit/mass/CMakeLists.txt
@@ -1,12 +1,10 @@
-
-#install headers
 install(FILES
-indicesmass.hh
-indicesmasskinetic.hh
-localresidualmass.hh
-localresidualmasskinetic.hh
-volumevariablesmass.hh
-volumevariablesmasskinetic.hh
-vtkwritermass.hh
-vtkwritermasskinetic.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/mpnc/implicit/mass)
+  indices.hh
+  indiceskinetic.hh
+  localresidual.hh
+  localresidualkinetic.hh
+  volumevariables.hh
+  volumevariableskinetic.hh
+  vtkwriter.hh
+  vtkwriterkinetic.hh
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/mpnc/implicit/mass)
-- 
GitLab