From c967b4f582afd2c75a870d61c8c41d536a7f5fdf Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Mon, 18 Jun 2018 17:30:45 +0200
Subject: [PATCH] [cmake] fix make install

`make install` din't work anymore since files listed in some
`CMakeLists.txt` couldn't be found. With this patch, `make install`
completes without error. I haven't checked if the installed stuff
can actually be used.

Thanks to Markus Blatt for pointing this out.
---
 dumux/discretization/CMakeLists.txt                   |  1 -
 dumux/discretization/cellcentered/mpfa/CMakeLists.txt |  3 +--
 dumux/discretization/staggered/CMakeLists.txt         | 10 ++++------
 dumux/linear/CMakeLists.txt                           |  4 ++--
 dumux/material/fluidsystems/CMakeLists.txt            |  9 +++++----
 dumux/material/solidsystems/CMakeLists.txt            |  2 +-
 dumux/porousmediumflow/2p/CMakeLists.txt              |  7 +++++--
 dumux/porousmediumflow/mpnc/CMakeLists.txt            |  3 ++-
 8 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/dumux/discretization/CMakeLists.txt b/dumux/discretization/CMakeLists.txt
index 1fd9c81445..1db77918ee 100644
--- a/dumux/discretization/CMakeLists.txt
+++ b/dumux/discretization/CMakeLists.txt
@@ -16,7 +16,6 @@ fvgridvariables.hh
 fvproperties.hh
 methods.hh
 scvandscvfiterators.hh
-scvoperator.hh
 stationaryvelocityfield.hh
 subcontrolvolumebase.hh
 subcontrolvolumefacebase.hh
diff --git a/dumux/discretization/cellcentered/mpfa/CMakeLists.txt b/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
index 86256a3acb..a77788d00f 100644
--- a/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
+++ b/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_subdirectory("omethod")
 
 install(FILES
-computetransmissibility
+computetransmissibility.hh
 connectivitymap.hh
 darcyslaw.hh
 dualgridindexset.hh
@@ -12,7 +12,6 @@ fluxvariablescachefiller.hh
 fourierslaw.hh
 fvelementgeometry.hh
 fvgridgeometry.hh
-generalconnectivitymap.hh
 gridfluxvariablescache.hh
 gridinteractionvolumeindexsets.hh
 helper.hh
diff --git a/dumux/discretization/staggered/CMakeLists.txt b/dumux/discretization/staggered/CMakeLists.txt
index 2c9c80e3c9..a792fb69ba 100644
--- a/dumux/discretization/staggered/CMakeLists.txt
+++ b/dumux/discretization/staggered/CMakeLists.txt
@@ -1,17 +1,15 @@
 add_subdirectory("freeflow")
 
 install(FILES
-connectivitymap.hh
 elementfacevariables.hh
-elementfluxvariables.hh
-elementvolumevariables.hh
+elementfluxvariablescache.hh
+elementsolution.hh
 facesolution.hh
 fvelementgeometry.hh
 fvgridgeometry.hh
-globalfacevariables.hh
-gridfluxvariables.hh
+gridfacevariables.hh
+gridfluxvariablescache.hh
 gridvariables.hh
-gridvolumevariables.hh
 properties.hh
 subcontrolvolumeface.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/discretization/staggered)
diff --git a/dumux/linear/CMakeLists.txt b/dumux/linear/CMakeLists.txt
index 525c3ed5da..1c70800667 100644
--- a/dumux/linear/CMakeLists.txt
+++ b/dumux/linear/CMakeLists.txt
@@ -4,9 +4,9 @@ amgbackend.hh
 amgparallelhelpers.hh
 amgtraits.hh
 linearsolveracceptsmultitypematrix.hh
-linearsolverproperties.hh
-pardisobackend.hh
+matrixconverter.hh
 scotchbackend.hh
 seqsolverbackend.hh
+solver.hh
 vectorexchange.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/linear)
diff --git a/dumux/material/fluidsystems/CMakeLists.txt b/dumux/material/fluidsystems/CMakeLists.txt
index 9226fb7542..3b5f1e5c86 100644
--- a/dumux/material/fluidsystems/CMakeLists.txt
+++ b/dumux/material/fluidsystems/CMakeLists.txt
@@ -1,18 +1,19 @@
 install(FILES
+  1pgas.hh
+  1pliquid.hh
+  2p1c.hh
   2pimmiscible.hh
-  2pliquidvapor.hh
+  3pimmiscible.hh
   base.hh
   brineair.hh
   brineco2.hh
-  1pgas.hh
   h2oair.hh
   h2oairmesitylene.hh
   h2oairxylene.hh
-  h2oheavyoilfluidsystem.hh
+  h2oheavyoil.hh
   h2on2.hh
   h2on2kinetic.hh
   h2on2o2.hh
-  1pliquid.hh
   liquidphase2c.hh
   nullparametercache.hh
   parametercachebase.hh
diff --git a/dumux/material/solidsystems/CMakeLists.txt b/dumux/material/solidsystems/CMakeLists.txt
index 211e9cc08a..0e9afac559 100644
--- a/dumux/material/solidsystems/CMakeLists.txt
+++ b/dumux/material/solidsystems/CMakeLists.txt
@@ -1,4 +1,4 @@
 install(FILES
   inertsolidphase.hh
-  compositionalsolidstate.hh
+  compositionalsolidphase.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/solidsystems)
diff --git a/dumux/porousmediumflow/2p/CMakeLists.txt b/dumux/porousmediumflow/2p/CMakeLists.txt
index 068e9dc616..10af09f9c6 100644
--- a/dumux/porousmediumflow/2p/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/CMakeLists.txt
@@ -2,11 +2,14 @@ add_subdirectory("sequential")
 
 #install headers
 install(FILES
-adaptionhelper.hh
+boxmaterialinterfaceparams.hh
+formulation.hh
 gridadaptindicator.hh
-indices.hh
+griddatatransfer.hh
 incompressiblelocalresidual.hh
+indices.hh
 model.hh
+saturationreconstruction.hh
 volumevariables.hh
 vtkoutputfields.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p)
diff --git a/dumux/porousmediumflow/mpnc/CMakeLists.txt b/dumux/porousmediumflow/mpnc/CMakeLists.txt
index 178f4c5f8d..b203874496 100644
--- a/dumux/porousmediumflow/mpnc/CMakeLists.txt
+++ b/dumux/porousmediumflow/mpnc/CMakeLists.txt
@@ -3,6 +3,7 @@ install(FILES
 indices.hh
 localresidual.hh
 model.hh
+pressureformulation.hh
 volumevariables.hh
-vtkoutputfield.hh
+vtkoutputfields.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/mpnc)
-- 
GitLab