From 5013525236f711d70d4f74644320fb6b2e1b6432 Mon Sep 17 00:00:00 2001 From: Ned Coltman <edward.coltman@iws.uni-stuttgart.de> Date: Mon, 4 May 2020 19:01:39 +0000 Subject: [PATCH] Merge branch 'fix/install-headers' into 'master' [fix] Update cmake install headers See merge request dumux-repositories/dumux!2117 (cherry picked from commit e6407fecd58b762bfd1ca5bd540c14c644716685) 72b7a46f [fix] Update cmake install headers --- dumux/common/CMakeLists.txt | 3 ++- dumux/flux/CMakeLists.txt | 2 ++ dumux/linear/CMakeLists.txt | 4 +++- dumux/material/components/CMakeLists.txt | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dumux/common/CMakeLists.txt b/dumux/common/CMakeLists.txt index bcfa96e8ec..2af4091ab0 100644 --- a/dumux/common/CMakeLists.txt +++ b/dumux/common/CMakeLists.txt @@ -7,13 +7,14 @@ balanceequationopts.hh boundaryconditions.hh boundaryflag.hh boundarytypes.hh -boundingboxtree.hh cubicspline.hh cubicsplinehermitebasis.hh defaultmappertraits.hh defaultusagemessage.hh deprecated.hh dimensionlessnumbers.hh +doubleexpintegrationconstants.hh +doubleexpintegrator.hh dumuxmessage.hh entitymap.hh exceptions.hh diff --git a/dumux/flux/CMakeLists.txt b/dumux/flux/CMakeLists.txt index e32e550170..6ec79ed53d 100644 --- a/dumux/flux/CMakeLists.txt +++ b/dumux/flux/CMakeLists.txt @@ -7,6 +7,7 @@ add_subdirectory(staggered) install(FILES darcyslaw.hh effectivestresslaw.hh +fickiandiffusioncoefficients.hh fickslaw.hh fluxvariablesbase.hh fluxvariablescaching.hh @@ -14,6 +15,7 @@ forchheimerslaw.hh fourierslaw.hh fourierslawnonequilibrium.hh hookeslaw.hh +maxwellstefandiffusioncoefficients.hh maxwellstefanslaw.hh referencesystemformulation.hh shallowwaterflux.hh diff --git a/dumux/linear/CMakeLists.txt b/dumux/linear/CMakeLists.txt index 1b5e58026f..e0c50d49e6 100644 --- a/dumux/linear/CMakeLists.txt +++ b/dumux/linear/CMakeLists.txt @@ -3,12 +3,14 @@ amgbackend.hh amgparallelhelpers.hh amgtraits.hh istlsolverfactorybackend.hh +istlsolverregistry.hh +linearsolveracceptsmultitypematrix.hh linearsolverparameters.hh linearsolvertraits.hh -linearsolveracceptsmultitypematrix.hh matrixconverter.hh parallelhelpers.hh pdesolver.hh +preconditioners.hh scotchbackend.hh seqsolverbackend.hh solver.hh diff --git a/dumux/material/components/CMakeLists.txt b/dumux/material/components/CMakeLists.txt index 4a9095cfa1..f343f70373 100644 --- a/dumux/material/components/CMakeLists.txt +++ b/dumux/material/components/CMakeLists.txt @@ -2,6 +2,7 @@ add_subdirectory(iapws) install(FILES air.hh +ammonia.hh base.hh benzene.hh brine.hh @@ -11,12 +12,14 @@ cao.hh cao2h2.hh carbonateion.hh ch4.hh +chlorideion.hh co2.hh co2tablereader.hh co2tables.inc componenttraits.hh constant.hh gas.hh +glucose.hh granite.hh h2.hh h2o.hh @@ -28,8 +31,10 @@ n2.hh nacl.hh o2.hh simpleh2o.hh +sodiumion.hh solid.hh tabulatedcomponent.hh trichloroethene.hh +urea.hh xylene.hh DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/components) -- GitLab