From 0affdbfe19afedacf377e985e99a37eacddb9643 Mon Sep 17 00:00:00 2001
From: Robert Keser <keser@son>
Date: Tue, 7 Mar 2017 14:27:31 +0100
Subject: [PATCH] Transition to cmake build system (added dbns and minor
 changes)

---
 CMakeLists.txt                                  | 17 ++++++++++++++---
 applications/CMakeLists.txt                     |  5 +++--
 applications/solvers/CMakeLists.txt             |  3 ++-
 applications/solvers/DNS/CMakeLists.txt         |  3 ++-
 applications/solvers/basic/CMakeLists.txt       |  3 ++-
 applications/solvers/combustion/CMakeLists.txt  |  3 ++-
 .../solvers/combustion/XiFoam/CMakeLists.txt    |  3 +--
 .../combustion/engineFoam/CMakeLists.txt        |  3 +--
 .../solvers/combustion/fireFoam/CMakeLists.txt  |  3 ++-
 .../fireFoam/combustionModels/CMakeLists.txt    |  9 +--------
 .../solvers/compressible/CMakeLists.txt         |  7 ++++---
 .../compressible/dbnsFoam/CMakeLists.txt        |  2 +-
 .../compressible/dbnsTurbFoam/CMakeLists.txt    |  2 +-
 .../compressible/rhoCentralFoam/CMakeLists.txt  |  3 ++-
 .../rhoPorousSimpleFoam/CMakeLists.txt          |  4 ----
 .../compressible/rhoSimpleFoam/CMakeLists.txt   |  4 ----
 .../compressible/rhopSonicFoam/CMakeLists.txt   |  3 ++-
 applications/solvers/coupled/CMakeLists.txt     |  3 ++-
 .../solvers/discreteMethods/CMakeLists.txt      |  3 ++-
 .../solvers/discreteMethods/dsmc/CMakeLists.txt |  3 ++-
 .../molecularDynamics/CMakeLists.txt            |  3 ++-
 .../solvers/electromagnetics/CMakeLists.txt     |  3 ++-
 applications/solvers/engine/CMakeLists.txt      |  3 ++-
 .../sonicTurbDyMEngineFoam/CMakeLists.txt       |  2 +-
 applications/solvers/financial/CMakeLists.txt   |  3 ++-
 applications/solvers/finiteArea/CMakeLists.txt  |  3 ++-
 .../solvers/heatTransfer/CMakeLists.txt         |  3 ++-
 .../solvers/immersedBoundary/CMakeLists.txt     |  3 ++-
 .../solvers/incompressible/CMakeLists.txt       |  3 ++-
 applications/solvers/lagrangian/CMakeLists.txt  |  3 ++-
 .../lagrangian/coalChemistryFoam/CMakeLists.txt |  3 +--
 .../CMakeLists.txt                              |  3 +--
 .../reactingParcelFoam/CMakeLists.txt           |  3 +--
 .../uncoupledKinematicParcelFoam/CMakeLists.txt |  2 +-
 applications/solvers/multiSolver/CMakeLists.txt |  3 ++-
 .../multiSolver/multiSolverDemo/CMakeLists.txt  |  4 ----
 applications/solvers/multiphase/CMakeLists.txt  |  5 +++--
 .../multiphase/MRFInterFoam/CMakeLists.txt      |  2 +-
 .../multiphase/cavitatingFoam/CMakeLists.txt    |  3 +--
 .../compressibleInterDyMFoam/CMakeLists.txt     |  3 +--
 .../compressibleInterFoam/CMakeLists.txt        |  2 +-
 .../multiphase/interDyMFoam/CMakeLists.txt      |  4 +---
 .../solvers/multiphase/interFoam/CMakeLists.txt |  2 +-
 .../multiphase/interMixingFoam/CMakeLists.txt   |  2 +-
 .../interPhaseChangeFoam/CMakeLists.txt         |  2 +-
 .../multiphaseInterFoam/CMakeLists.txt          |  2 +-
 .../multiphase/porousInterFoam/CMakeLists.txt   |  3 +--
 .../twoLiquidMixingFoam/CMakeLists.txt          |  2 +-
 .../multiphase/twoPhaseEulerFoam/CMakeLists.txt |  3 ++-
 .../interfacialModels/CMakeLists.txt            |  6 +-----
 .../kineticTheoryModels/CMakeLists.txt          |  4 +---
 .../twoPhaseEulerFoam/phaseModel/CMakeLists.txt |  2 +-
 .../solvers/solidMechanics/CMakeLists.txt       |  3 ++-
 .../deprecatedSolvers/CMakeLists.txt            |  3 ++-
 .../solidMechanics/utilities/CMakeLists.txt     |  3 ++-
 .../solvers/surfaceTracking/CMakeLists.txt      |  3 ++-
 .../bubbleInterTrackFoam/CMakeLists.txt         |  1 -
 .../surfaceTracking/utilities/CMakeLists.txt    |  3 ++-
 .../solvers/viscoelastic/CMakeLists.txt         |  3 ++-
 applications/utilities/CMakeLists.txt           |  3 ++-
 .../utilities/errorEstimation/CMakeLists.txt    |  3 ++-
 .../utilities/finiteArea/CMakeLists.txt         |  3 ++-
 .../utilities/immersedBoundary/CMakeLists.txt   |  3 ++-
 applications/utilities/mesh/CMakeLists.txt      |  3 ++-
 .../utilities/mesh/advanced/CMakeLists.txt      |  3 ++-
 .../utilities/mesh/conversion/CMakeLists.txt    |  3 ++-
 .../mesh/conversion/Optional/CMakeLists.txt     |  3 ++-
 .../mesh/conversion/star4ToFoam/CMakeLists.txt  |  3 ++-
 .../utilities/mesh/generation/CMakeLists.txt    |  3 ++-
 .../mesh/generation/cfMesh/CMakeLists.txt       |  3 ++-
 .../utilities/mesh/manipulation/CMakeLists.txt  |  3 ++-
 .../utilities/miscellaneous/CMakeLists.txt      |  3 ++-
 .../miscellaneous/autoDerivative/CMakeLists.txt |  3 ++-
 .../utilities/parallelProcessing/CMakeLists.txt |  3 ++-
 .../utilities/postProcessing/CMakeLists.txt     |  3 ++-
 .../utilities/postProcessing/POD/CMakeLists.txt |  3 ++-
 .../dataConversion/CMakeLists.txt               |  3 ++-
 .../foamToTecplot360/CMakeLists.txt             |  3 ++-
 .../foamToTecplot360/tecio/CMakeLists.txt       |  3 ++-
 .../postProcessing/graphics/CMakeLists.txt      |  3 ++-
 .../graphics/PV3FoamReader/CMakeLists.txt       |  3 ++-
 .../graphics/PVFoamReader/CMakeLists.txt        |  3 ++-
 .../postProcessing/lagrangian/CMakeLists.txt    |  3 ++-
 .../postProcessing/miscellaneous/CMakeLists.txt |  3 ++-
 .../postProcessing/patch/CMakeLists.txt         |  3 ++-
 .../postProcessing/sampling/CMakeLists.txt      |  3 ++-
 .../postProcessing/scalarField/CMakeLists.txt   |  3 ++-
 .../postProcessing/stressField/CMakeLists.txt   |  3 ++-
 .../postProcessing/turbulence/CMakeLists.txt    |  3 ++-
 .../postProcessing/velocityField/CMakeLists.txt |  3 ++-
 .../postProcessing/viscoelastic/CMakeLists.txt  |  3 ++-
 .../postProcessing/wall/CMakeLists.txt          |  3 ++-
 .../utilities/preProcessing/CMakeLists.txt      |  3 ++-
 .../utilities/solidMechanics/CMakeLists.txt     |  3 ++-
 .../utilities/thermophysical/CMakeLists.txt     |  3 ++-
 src/CMakeLists.txt                              |  5 +++--
 src/OSspecific/CMakeLists.txt                   |  3 ++-
 src/cudaSolvers/CMakeLists.txt                  |  2 +-
 src/dbns/CMakeLists.txt                         |  8 +++++++-
 src/decompositionMethods/CMakeLists.txt         |  3 ++-
 src/dynamicMesh/CMakeLists.txt                  |  3 ++-
 src/dynamicMesh/meshMotion/CMakeLists.txt       |  3 ++-
 src/finiteVolume/CMakeLists.txt                 |  4 ++++
 src/fvAgglomerationMethods/CMakeLists.txt       |  3 ++-
 src/immersedBoundary/CMakeLists.txt             |  3 ++-
 src/lagrangian/CMakeLists.txt                   |  3 ++-
 src/lagrangian/molecularDynamics/CMakeLists.txt |  3 ++-
 src/mesh/CMakeLists.txt                         |  3 ++-
 src/postProcessing/CMakeLists.txt               |  3 ++-
 .../functionObjects/CMakeLists.txt              |  3 ++-
 src/thermophysicalModels/CMakeLists.txt         |  3 ++-
 src/transportModels/CMakeLists.txt              |  3 ++-
 .../incompressible/CMakeLists.txt               |  1 -
 src/turbulenceModels/CMakeLists.txt             |  3 ++-
 src/turbulenceModels/LES/CMakeLists.txt         |  3 ++-
 .../compressible/CMakeLists.txt                 |  3 ++-
 .../incompressible/CMakeLists.txt               |  3 ++-
 tutorials/CMakeLists.txt                        |  3 ++-
 tutorials/basic/CMakeLists.txt                  |  3 ++-
 .../basic/PODSolver/1DPODsin/CMakeLists.txt     |  3 ++-
 tutorials/basic/PODSolver/CMakeLists.txt        |  3 ++-
 tutorials/basic/potentialFoam/CMakeLists.txt    |  3 ++-
 .../basic/potentialFoam/cylinder/CMakeLists.txt |  3 ++-
 .../basic/scalarTransportFoam/CMakeLists.txt    |  3 ++-
 .../swirlTest/CMakeLists.txt                    |  3 ++-
 tutorials/compressible/CMakeLists.txt           |  3 ++-
 .../compressible/rhoCentralFoam/CMakeLists.txt  |  3 ++-
 .../biconic25-55Run35/CMakeLists.txt            |  3 ++-
 tutorials/finiteArea/CMakeLists.txt             |  3 ++-
 .../finiteArea/liquidFilmFoam/CMakeLists.txt    |  3 ++-
 .../dropsSpreading/CMakeLists.txt               |  3 ++-
 .../finiteArea/surfactantFoam/CMakeLists.txt    |  3 ++-
 .../sphereTransport/CMakeLists.txt              |  3 ++-
 tutorials/heatTransfer/CMakeLists.txt           |  3 ++-
 .../heatTransfer/buoyantPisoFoam/CMakeLists.txt |  3 ++-
 .../buoyantPisoFoam/hotRoom/CMakeLists.txt      |  3 ++-
 tutorials/immersedBoundary/CMakeLists.txt       |  3 ++-
 .../sphereInChannel/CMakeLists.txt              |  3 ++-
 .../thickPlateRefinedMesh/CMakeLists.txt        |  3 ++-
 tutorials/incompressible/CMakeLists.txt         |  3 ++-
 .../incompressible/icoDyMFoam/CMakeLists.txt    |  3 ++-
 .../icoDyMFoam/movingBlockRBF/CMakeLists.txt    |  3 ++-
 .../icoDyMFoam/movingConeMotion/CMakeLists.txt  |  3 ++-
 tutorials/lagrangian/CMakeLists.txt             |  3 ++-
 .../lagrangian/icoLagrangianFoam/CMakeLists.txt |  3 ++-
 .../rhoPisoTwinParcelFoam/CMakeLists.txt        |  3 ++-
 tutorials/multiphase/CMakeLists.txt             |  3 ++-
 .../multiphase/interDyMFoam/CMakeLists.txt      |  3 ++-
 .../multiphase/interDyMFoam/ras/CMakeLists.txt  |  3 ++-
 .../ras/sloshingTank3D6DoF/CMakeLists.txt       |  3 ++-
 tutorials/solidMechanics/CMakeLists.txt         |  3 ++-
 .../elasticSolidFoam/CMakeLists.txt             |  3 ++-
 .../elasticSolidFoam/plateHole/CMakeLists.txt   |  3 ++-
 .../elasticThermalSolidFoam/CMakeLists.txt      |  3 ++-
 .../hotCylinder/CMakeLists.txt                  |  3 ++-
 .../analyticalHotCylinder/CMakeLists.txt        |  3 ++-
 156 files changed, 301 insertions(+), 194 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d19ced00..539ad5613 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,13 +72,24 @@ set_property(TARGET mpi PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MPI_C_INCLUDE_P
 set_property(TARGET mpi PROPERTY IMPORTED_LOCATION ${MPI_LIBRARY})
 
 find_package(ZLIB REQUIRED)
-  
+
 find_package(FLEX REQUIRED)
 
 find_package(Git REQUIRED)
 
+# Path to ParaViewConfig.cmake
+set(ParaView_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/packages/ParaView-4.4.0/platforms/linux64GccDPOpt/lib/cmake/paraview-4.4)
+
 find_package(ParaView REQUIRED)
 
+# Clean the cache variable
+set(MGRIDGEN_LIBRARY MGRIDGEN_LIBRARY-NOTFOUND)
+
+# Find libMGridGen.so
+find_library(MGRIDGEN_LIBRARY MGridGen ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/packages/ParMGridGen-1.0/platforms/linux64GccDPOpt/lib)
+set(MGRIDGEN_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/packages/ParMGridGen-1.0/platforms/linux64GccDPOpt/include)
+
+
 #
 # Recurse into the source
 #
@@ -102,14 +113,14 @@ if(NOT CMAKE_BUILD_TYPE)
     "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
     FORCE)
 endif()
-   
+
 #
 # Definitions inherited by all targets
 #
 
 # Single/Double precision
 set(FOAM_PRECISION "double" CACHE STRING "Numerical precision")
-set_property(CACHE FOAM_PRECISION PROPERTY STRINGS single double) 
+set_property(CACHE FOAM_PRECISION PROPERTY STRINGS single double)
 if(FOAM_PRECISION EQUAL "single")
   target_compile_definitions(OSspecific PUBLIC WM_SP)
 else()
diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt
index 7590a1788..8ff13b174 100644
--- a/applications/CMakeLists.txt
+++ b/applications/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
@@ -30,4 +31,4 @@
 # --------------------------------------------------------------------------
 
 add_subdirectory(utilities)
-add_subdirectory(solvers)
\ No newline at end of file
+add_subdirectory(solvers)
diff --git a/applications/solvers/CMakeLists.txt b/applications/solvers/CMakeLists.txt
index 960a075d3..eec85dfe2 100644
--- a/applications/solvers/CMakeLists.txt
+++ b/applications/solvers/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/DNS/CMakeLists.txt b/applications/solvers/DNS/CMakeLists.txt
index a31352d4e..1143571cf 100644
--- a/applications/solvers/DNS/CMakeLists.txt
+++ b/applications/solvers/DNS/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/basic/CMakeLists.txt b/applications/solvers/basic/CMakeLists.txt
index 1e032ce16..4324f1f97 100644
--- a/applications/solvers/basic/CMakeLists.txt
+++ b/applications/solvers/basic/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/combustion/CMakeLists.txt b/applications/solvers/combustion/CMakeLists.txt
index 8ea223117..095c01c64 100644
--- a/applications/solvers/combustion/CMakeLists.txt
+++ b/applications/solvers/combustion/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/combustion/XiFoam/CMakeLists.txt b/applications/solvers/combustion/XiFoam/CMakeLists.txt
index 11f4ff1d8..7a8786c89 100644
--- a/applications/solvers/combustion/XiFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/XiFoam/CMakeLists.txt
@@ -41,7 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(XiFoam
-  DEPENDS reactionThermophysicalModels engine compressibleTurbulenceModel
-  DEPENDS laminarFlameSpeedModels
+  DEPENDS engine compressibleTurbulenceModel laminarFlameSpeedModels
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/combustion/engineFoam/CMakeLists.txt b/applications/solvers/combustion/engineFoam/CMakeLists.txt
index fece520e3..c41002435 100644
--- a/applications/solvers/combustion/engineFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/engineFoam/CMakeLists.txt
@@ -41,8 +41,7 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(engineFoam
-  DEPENDS reactionThermophysicalModels engine compressibleTurbulenceModel
-  DEPENDS laminarFlameSpeedModels
+  DEPENDS engine compressibleTurbulenceModel laminarFlameSpeedModels
   SOURCES ${SOURCES}
 )
 
diff --git a/applications/solvers/combustion/fireFoam/CMakeLists.txt b/applications/solvers/combustion/fireFoam/CMakeLists.txt
index 2afdcea2f..891dab31b 100644
--- a/applications/solvers/combustion/fireFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/fireFoam/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/combustion/fireFoam/combustionModels/CMakeLists.txt b/applications/solvers/combustion/fireFoam/combustionModels/CMakeLists.txt
index 9e51acbf1..c24bbdfd2 100644
--- a/applications/solvers/combustion/fireFoam/combustionModels/CMakeLists.txt
+++ b/applications/solvers/combustion/fireFoam/combustionModels/CMakeLists.txt
@@ -39,11 +39,4 @@ list(APPEND SOURCES
 
 add_foam_library(combustionModels SHARED ${SOURCES})
 
-target_link_libraries(combustionModels finiteVolume)
-
-target_include_directories(combustionModels PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/thermophysicalModels/basic/lnInclude>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/thermophysicalModels/reactionThermo/lnInclude>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/thermophysicalModels/specie/lnInclude>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/turbulenceModels/compressible/turbulenceModel>
-)
+target_link_libraries(combustionModels PUBLIC reactionThermophysicalModels compressibleTurbulenceModel)
diff --git a/applications/solvers/compressible/CMakeLists.txt b/applications/solvers/compressible/CMakeLists.txt
index 473be5284..db1a0b5f7 100644
--- a/applications/solvers/compressible/CMakeLists.txt
+++ b/applications/solvers/compressible/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
@@ -40,11 +41,11 @@ add_subdirectory(rhoPorousMRFPimpleFoam)
 add_subdirectory(rhopSonicFoam)
 add_subdirectory(rhoPisoFoam)
 add_subdirectory(steadyCompressibleFoam)
-#add_subdirectory(dbnsFoam)
+add_subdirectory(dbnsFoam)
 add_subdirectory(steadyUniversalFoam)
 add_subdirectory(steadyCompressibleMRFFoam)
 add_subdirectory(rhoSimpleFoam)
 add_subdirectory(sonicLiquidFoam)
 add_subdirectory(rhoCentralFoam)
 add_subdirectory(rhoPorousSimpleFoam)
-#add_subdirectory(dbnsTurbFoam)
+add_subdirectory(dbnsTurbFoam)
diff --git a/applications/solvers/compressible/dbnsFoam/CMakeLists.txt b/applications/solvers/compressible/dbnsFoam/CMakeLists.txt
index ad9a93677..e06056367 100644
--- a/applications/solvers/compressible/dbnsFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/dbnsFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(dbnsFoam
-  DEPENDS basicThermophysicalModels dbns
+  DEPENDS dbns
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/dbnsTurbFoam/CMakeLists.txt b/applications/solvers/compressible/dbnsTurbFoam/CMakeLists.txt
index e550791c0..9fc434c8a 100644
--- a/applications/solvers/compressible/dbnsTurbFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/dbnsTurbFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(dbnsTurbFoam
-#   DEPENDS finiteVolume
+  DEPENDS dbns
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/rhoCentralFoam/CMakeLists.txt b/applications/solvers/compressible/rhoCentralFoam/CMakeLists.txt
index d9a335de8..18725c311 100644
--- a/applications/solvers/compressible/rhoCentralFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoCentralFoam/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/CMakeLists.txt b/applications/solvers/compressible/rhoPorousSimpleFoam/CMakeLists.txt
index e9625d07a..c97da0e64 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/CMakeLists.txt
@@ -44,7 +44,3 @@ add_foam_executable(rhoPorousSimpleFoam
   DEPENDS compressibleRASModels
   SOURCES ${SOURCES}
 )
-
-target_include_directories(rhoPorousSimpleFoam PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/finiteVolume/cfdTools>
-)
diff --git a/applications/solvers/compressible/rhoSimpleFoam/CMakeLists.txt b/applications/solvers/compressible/rhoSimpleFoam/CMakeLists.txt
index 148a64140..48d683d51 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoSimpleFoam/CMakeLists.txt
@@ -44,7 +44,3 @@ add_foam_executable(rhoSimpleFoam
   DEPENDS compressibleRASModels
   SOURCES ${SOURCES}
 )
-
-target_include_directories(rhoSimpleFoam PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/finiteVolume/cfdTools>
-)
diff --git a/applications/solvers/compressible/rhopSonicFoam/CMakeLists.txt b/applications/solvers/compressible/rhopSonicFoam/CMakeLists.txt
index d9a335de8..18725c311 100644
--- a/applications/solvers/compressible/rhopSonicFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhopSonicFoam/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/coupled/CMakeLists.txt b/applications/solvers/coupled/CMakeLists.txt
index c52cdff18..f1d304bee 100644
--- a/applications/solvers/coupled/CMakeLists.txt
+++ b/applications/solvers/coupled/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/discreteMethods/CMakeLists.txt b/applications/solvers/discreteMethods/CMakeLists.txt
index b3fbc03f0..6e90bc0e7 100644
--- a/applications/solvers/discreteMethods/CMakeLists.txt
+++ b/applications/solvers/discreteMethods/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/discreteMethods/dsmc/CMakeLists.txt b/applications/solvers/discreteMethods/dsmc/CMakeLists.txt
index 49b29ec4e..804f1a363 100644
--- a/applications/solvers/discreteMethods/dsmc/CMakeLists.txt
+++ b/applications/solvers/discreteMethods/dsmc/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/discreteMethods/molecularDynamics/CMakeLists.txt b/applications/solvers/discreteMethods/molecularDynamics/CMakeLists.txt
index 8da6f442c..ed10617c0 100644
--- a/applications/solvers/discreteMethods/molecularDynamics/CMakeLists.txt
+++ b/applications/solvers/discreteMethods/molecularDynamics/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/electromagnetics/CMakeLists.txt b/applications/solvers/electromagnetics/CMakeLists.txt
index 28c1feef0..74fd23060 100644
--- a/applications/solvers/electromagnetics/CMakeLists.txt
+++ b/applications/solvers/electromagnetics/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/engine/CMakeLists.txt b/applications/solvers/engine/CMakeLists.txt
index 3f15c5960..f4ae8f80b 100644
--- a/applications/solvers/engine/CMakeLists.txt
+++ b/applications/solvers/engine/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/CMakeLists.txt b/applications/solvers/engine/sonicTurbDyMEngineFoam/CMakeLists.txt
index 43b571200..1ff6a36ec 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/CMakeLists.txt
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(sonicTurbDyMEngineFoam
-  DEPENDS basicThermophysicalModels compressibleTurbulenceModel engine
+  DEPENDS compressibleTurbulenceModel engine
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/financial/CMakeLists.txt b/applications/solvers/financial/CMakeLists.txt
index c3ef7c5d3..3250f3fe7 100644
--- a/applications/solvers/financial/CMakeLists.txt
+++ b/applications/solvers/financial/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/finiteArea/CMakeLists.txt b/applications/solvers/finiteArea/CMakeLists.txt
index 505bf7efb..c9f2fe833 100644
--- a/applications/solvers/finiteArea/CMakeLists.txt
+++ b/applications/solvers/finiteArea/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/heatTransfer/CMakeLists.txt b/applications/solvers/heatTransfer/CMakeLists.txt
index 91dd945ff..fc3068890 100644
--- a/applications/solvers/heatTransfer/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/immersedBoundary/CMakeLists.txt b/applications/solvers/immersedBoundary/CMakeLists.txt
index 5420b65d0..19bb1ec34 100644
--- a/applications/solvers/immersedBoundary/CMakeLists.txt
+++ b/applications/solvers/immersedBoundary/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/incompressible/CMakeLists.txt b/applications/solvers/incompressible/CMakeLists.txt
index 70dbeb1b3..a9ba4fafd 100644
--- a/applications/solvers/incompressible/CMakeLists.txt
+++ b/applications/solvers/incompressible/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/lagrangian/CMakeLists.txt b/applications/solvers/lagrangian/CMakeLists.txt
index 6339e3bcf..73de7974b 100644
--- a/applications/solvers/lagrangian/CMakeLists.txt
+++ b/applications/solvers/lagrangian/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/CMakeLists.txt b/applications/solvers/lagrangian/coalChemistryFoam/CMakeLists.txt
index 510e55707..39afe6927 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/CMakeLists.txt
+++ b/applications/solvers/lagrangian/coalChemistryFoam/CMakeLists.txt
@@ -41,7 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(coalChemistryFoam
-  DEPENDS finiteVolume compressibleTurbulenceModel lagrangianIntermediate
-  DEPENDS chemistryModel coalCombustion
+  DEPENDS lagrangianIntermediate coalCombustion chemistryModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/CMakeLists.txt b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/CMakeLists.txt
index faebf55b2..96bdc58e0 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/CMakeLists.txt
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/CMakeLists.txt
@@ -41,7 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(porousExplicitSourceReactingParcelFoam
-  DEPENDS finiteVolume compressibleTurbulenceModel lagrangianIntermediate
-  DEPENDS chemistryModel
+  DEPENDS lagrangianIntermediate chemistryModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/CMakeLists.txt b/applications/solvers/lagrangian/reactingParcelFoam/CMakeLists.txt
index 6e921c2eb..fc35f80e0 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/CMakeLists.txt
+++ b/applications/solvers/lagrangian/reactingParcelFoam/CMakeLists.txt
@@ -41,7 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(reactingParcelFoam
-  DEPENDS finiteVolume compressibleTurbulenceModel lagrangianIntermediate
-  DEPENDS chemistryModel
+  DEPENDS lagrangianIntermediate chemistryModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/CMakeLists.txt b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/CMakeLists.txt
index f91f5bb36..2a75f3de3 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/CMakeLists.txt
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(uncoupledKinematicParcelFoam
-  DEPENDS finiteVolume compressibleTurbulenceModel lagrangianIntermediate
+  DEPENDS lagrangianIntermediate
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiSolver/CMakeLists.txt b/applications/solvers/multiSolver/CMakeLists.txt
index d9c7dd055..050db8301 100644
--- a/applications/solvers/multiSolver/CMakeLists.txt
+++ b/applications/solvers/multiSolver/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/multiSolver/multiSolverDemo/CMakeLists.txt b/applications/solvers/multiSolver/multiSolverDemo/CMakeLists.txt
index 67751f8d4..69930c66e 100644
--- a/applications/solvers/multiSolver/multiSolverDemo/CMakeLists.txt
+++ b/applications/solvers/multiSolver/multiSolverDemo/CMakeLists.txt
@@ -44,7 +44,3 @@ add_foam_executable(multiSolverDemo
   DEPENDS finiteVolume multiSolverLib
   SOURCES ${SOURCES}
 )
-
-target_include_directories(multiSolverDemo PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/multiSolver/lnInclude>
-)
diff --git a/applications/solvers/multiphase/CMakeLists.txt b/applications/solvers/multiphase/CMakeLists.txt
index b1e3ae6e1..6c454723a 100644
--- a/applications/solvers/multiphase/CMakeLists.txt
+++ b/applications/solvers/multiphase/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
@@ -43,4 +44,4 @@ add_subdirectory(compressibleInterDyMFoam)
 add_subdirectory(interFoam)
 add_subdirectory(settlingFoam)
 add_subdirectory(porousInterFoam)
-add_subdirectory(cavitatingFoam)
\ No newline at end of file
+add_subdirectory(cavitatingFoam)
diff --git a/applications/solvers/multiphase/MRFInterFoam/CMakeLists.txt b/applications/solvers/multiphase/MRFInterFoam/CMakeLists.txt
index 70c2118b2..2acb1ca3c 100644
--- a/applications/solvers/multiphase/MRFInterFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/MRFInterFoam/CMakeLists.txt
@@ -41,7 +41,7 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(MRFInterFoam
-  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
+  DEPENDS interfaceProperties incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
 
diff --git a/applications/solvers/multiphase/cavitatingFoam/CMakeLists.txt b/applications/solvers/multiphase/cavitatingFoam/CMakeLists.txt
index 1fca950a8..6bc047082 100644
--- a/applications/solvers/multiphase/cavitatingFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/cavitatingFoam/CMakeLists.txt
@@ -41,7 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(cavitatingFoam
-  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
-  DEPENDS barotropicCompressibilityModel
+  DEPENDS incompressibleTurbulenceModel barotropicCompressibilityModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/CMakeLists.txt b/applications/solvers/multiphase/compressibleInterDyMFoam/CMakeLists.txt
index 17b9c3329..f21718496 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/CMakeLists.txt
@@ -41,7 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(compressibleInterDyMFoam
-  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
-  DEPENDS dynamicFvMesh
+  DEPENDS interfaceProperties incompressibleTurbulenceModel dynamicFvMesh
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/compressibleInterFoam/CMakeLists.txt b/applications/solvers/multiphase/compressibleInterFoam/CMakeLists.txt
index d4c9b8661..0a7a8005c 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/compressibleInterFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(compressibleInterFoam
-  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
+  DEPENDS interfaceProperties incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/interDyMFoam/CMakeLists.txt b/applications/solvers/multiphase/interDyMFoam/CMakeLists.txt
index 55006de8e..745dfba6c 100644
--- a/applications/solvers/multiphase/interDyMFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/interDyMFoam/CMakeLists.txt
@@ -41,12 +41,10 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(interDyMFoam
-  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
-  DEPENDS dynamicFvMesh
+  DEPENDS interfaceProperties incompressibleTurbulenceModel dynamicFvMesh
   SOURCES ${SOURCES}
 )
 
 target_include_directories(interDyMFoam PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interFoam>
 )
-
diff --git a/applications/solvers/multiphase/interFoam/CMakeLists.txt b/applications/solvers/multiphase/interFoam/CMakeLists.txt
index 57279ebaf..b1573238d 100644
--- a/applications/solvers/multiphase/interFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/interFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(interFoam
-  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
+  DEPENDS interfaceProperties incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/interMixingFoam/CMakeLists.txt b/applications/solvers/multiphase/interMixingFoam/CMakeLists.txt
index e486a4064..a3a92b600 100644
--- a/applications/solvers/multiphase/interMixingFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/interMixingFoam/CMakeLists.txt
@@ -43,7 +43,7 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(interMixingFoam
-  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
+  DEPENDS interfaceProperties incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/CMakeLists.txt b/applications/solvers/multiphase/interPhaseChangeFoam/CMakeLists.txt
index d239ee1b6..417c5cd0c 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/CMakeLists.txt
@@ -46,7 +46,7 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(interPhaseChangeFoam
-  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
+  DEPENDS interfaceProperties incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
 
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/CMakeLists.txt b/applications/solvers/multiphase/multiphaseInterFoam/CMakeLists.txt
index 5ca6c6b3a..eab4c9c71 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/multiphaseInterFoam/CMakeLists.txt
@@ -44,7 +44,7 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(multiphaseInterFoam
-  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
+  DEPENDS interfaceProperties incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
 
diff --git a/applications/solvers/multiphase/porousInterFoam/CMakeLists.txt b/applications/solvers/multiphase/porousInterFoam/CMakeLists.txt
index a64ab896b..554037bd8 100644
--- a/applications/solvers/multiphase/porousInterFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/porousInterFoam/CMakeLists.txt
@@ -41,11 +41,10 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(porousInterFoam
-  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
+  DEPENDS interfaceProperties incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
 
 target_include_directories(porousInterFoam PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interFoam>
 )
-
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/CMakeLists.txt b/applications/solvers/multiphase/twoLiquidMixingFoam/CMakeLists.txt
index 91f28caa5..4c3f10a63 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/CMakeLists.txt
@@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
 endif()
 
 add_foam_executable(twoLiquidMixingFoam
-  DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel
+  DEPENDS interfaceProperties incompressibleTurbulenceModel
   SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/CMakeLists.txt b/applications/solvers/multiphase/twoPhaseEulerFoam/CMakeLists.txt
index 895700b93..3ffdd4b8a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt
index 5acc11844..78a1e0420 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt
@@ -44,8 +44,4 @@ list(APPEND SOURCES
 
 add_foam_library(EulerianInterfacialModels SHARED ${SOURCES})
 
-target_link_libraries(EulerianInterfacialModels PUBLIC finiteVolume phaseModel)
-
-target_include_directories(EulerianInterfacialModels PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../phaseModel>
-)
+target_link_libraries(EulerianInterfacialModels PUBLIC phaseModel)
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt
index e496cf16c..3dbb8709b 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt
@@ -61,10 +61,8 @@ list(APPEND SOURCES
 
 add_foam_library(kineticTheoryModel SHARED ${SOURCES})
 
-target_link_libraries(kineticTheoryModel PUBLIC finiteVolume phaseModel)
+target_link_libraries(kineticTheoryModel PUBLIC phaseModel)
 
 target_include_directories(kineticTheoryModel PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interfacialModels>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interfacialModels/dragModels/dragModel>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../phaseModel>
 )
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/CMakeLists.txt b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/CMakeLists.txt
index 1a6563c48..f9d4da264 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/CMakeLists.txt
@@ -36,4 +36,4 @@ list(APPEND SOURCES
 
 add_foam_library(phaseModel SHARED ${SOURCES})
 
-target_link_libraries(phaseModel PUBLIC finiteVolume incompressibleTransportModels)
+target_link_libraries(phaseModel PUBLIC incompressibleTransportModels)
diff --git a/applications/solvers/solidMechanics/CMakeLists.txt b/applications/solvers/solidMechanics/CMakeLists.txt
index d79cd8774..53ff30c5c 100644
--- a/applications/solvers/solidMechanics/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/CMakeLists.txt b/applications/solvers/solidMechanics/deprecatedSolvers/CMakeLists.txt
index 5377a1c8a..922eead0c 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/solidMechanics/utilities/CMakeLists.txt b/applications/solvers/solidMechanics/utilities/CMakeLists.txt
index 41a9a58d5..d35b27e13 100644
--- a/applications/solvers/solidMechanics/utilities/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/utilities/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/surfaceTracking/CMakeLists.txt b/applications/solvers/surfaceTracking/CMakeLists.txt
index 0186c04a2..57aa67254 100644
--- a/applications/solvers/surfaceTracking/CMakeLists.txt
+++ b/applications/solvers/surfaceTracking/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/surfaceTracking/bubbleInterTrackFoam/CMakeLists.txt b/applications/solvers/surfaceTracking/bubbleInterTrackFoam/CMakeLists.txt
index e5ed8cb74..f4f9fac4b 100644
--- a/applications/solvers/surfaceTracking/bubbleInterTrackFoam/CMakeLists.txt
+++ b/applications/solvers/surfaceTracking/bubbleInterTrackFoam/CMakeLists.txt
@@ -47,5 +47,4 @@ add_foam_executable(bubbleInterTrackFoam
 
 target_include_directories(bubbleInterTrackFoam PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../freeSurface/lnInclude>
 )
diff --git a/applications/solvers/surfaceTracking/utilities/CMakeLists.txt b/applications/solvers/surfaceTracking/utilities/CMakeLists.txt
index f73c82ae8..72a9baa3f 100644
--- a/applications/solvers/surfaceTracking/utilities/CMakeLists.txt
+++ b/applications/solvers/surfaceTracking/utilities/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/solvers/viscoelastic/CMakeLists.txt b/applications/solvers/viscoelastic/CMakeLists.txt
index 122eb4b32..ea5e45f47 100644
--- a/applications/solvers/viscoelastic/CMakeLists.txt
+++ b/applications/solvers/viscoelastic/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/CMakeLists.txt b/applications/utilities/CMakeLists.txt
index e0cde4bf2..e6d2eda88 100644
--- a/applications/utilities/CMakeLists.txt
+++ b/applications/utilities/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/errorEstimation/CMakeLists.txt b/applications/utilities/errorEstimation/CMakeLists.txt
index 47bd20bd4..6a3e32944 100644
--- a/applications/utilities/errorEstimation/CMakeLists.txt
+++ b/applications/utilities/errorEstimation/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/finiteArea/CMakeLists.txt b/applications/utilities/finiteArea/CMakeLists.txt
index 4ec204dfb..df3bf2e82 100644
--- a/applications/utilities/finiteArea/CMakeLists.txt
+++ b/applications/utilities/finiteArea/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/immersedBoundary/CMakeLists.txt b/applications/utilities/immersedBoundary/CMakeLists.txt
index 1f1810402..3a5f0b454 100644
--- a/applications/utilities/immersedBoundary/CMakeLists.txt
+++ b/applications/utilities/immersedBoundary/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/mesh/CMakeLists.txt b/applications/utilities/mesh/CMakeLists.txt
index 0c688067f..28caaf885 100644
--- a/applications/utilities/mesh/CMakeLists.txt
+++ b/applications/utilities/mesh/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/mesh/advanced/CMakeLists.txt b/applications/utilities/mesh/advanced/CMakeLists.txt
index cb0bb4a6d..09a985183 100644
--- a/applications/utilities/mesh/advanced/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/mesh/conversion/CMakeLists.txt b/applications/utilities/mesh/conversion/CMakeLists.txt
index 1f2294e39..a14e517a2 100644
--- a/applications/utilities/mesh/conversion/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/mesh/conversion/Optional/CMakeLists.txt b/applications/utilities/mesh/conversion/Optional/CMakeLists.txt
index 9b4ae369b..6bf17eb65 100644
--- a/applications/utilities/mesh/conversion/Optional/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/Optional/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/mesh/conversion/star4ToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/star4ToFoam/CMakeLists.txt
index 9ad80b336..73e70db16 100644
--- a/applications/utilities/mesh/conversion/star4ToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/star4ToFoam/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/mesh/generation/CMakeLists.txt b/applications/utilities/mesh/generation/CMakeLists.txt
index b6fe74ff4..b22dd86b4 100644
--- a/applications/utilities/mesh/generation/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/mesh/generation/cfMesh/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/CMakeLists.txt
index 4a256774e..a2c014ede 100644
--- a/applications/utilities/mesh/generation/cfMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/mesh/manipulation/CMakeLists.txt b/applications/utilities/mesh/manipulation/CMakeLists.txt
index a042bcd36..fa413db10 100644
--- a/applications/utilities/mesh/manipulation/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/miscellaneous/CMakeLists.txt b/applications/utilities/miscellaneous/CMakeLists.txt
index f21a26df8..5301bcfd0 100644
--- a/applications/utilities/miscellaneous/CMakeLists.txt
+++ b/applications/utilities/miscellaneous/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/miscellaneous/autoDerivative/CMakeLists.txt b/applications/utilities/miscellaneous/autoDerivative/CMakeLists.txt
index b741a7390..2240d523b 100644
--- a/applications/utilities/miscellaneous/autoDerivative/CMakeLists.txt
+++ b/applications/utilities/miscellaneous/autoDerivative/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/parallelProcessing/CMakeLists.txt b/applications/utilities/parallelProcessing/CMakeLists.txt
index e1306fadf..99df2cb0a 100644
--- a/applications/utilities/parallelProcessing/CMakeLists.txt
+++ b/applications/utilities/parallelProcessing/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/CMakeLists.txt b/applications/utilities/postProcessing/CMakeLists.txt
index 20f8b6a88..82b5e1c9b 100644
--- a/applications/utilities/postProcessing/CMakeLists.txt
+++ b/applications/utilities/postProcessing/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/POD/CMakeLists.txt b/applications/utilities/postProcessing/POD/CMakeLists.txt
index b02d80ba0..18741b282 100644
--- a/applications/utilities/postProcessing/POD/CMakeLists.txt
+++ b/applications/utilities/postProcessing/POD/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/dataConversion/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/CMakeLists.txt
index ac5556a6f..27a9b4768 100644
--- a/applications/utilities/postProcessing/dataConversion/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/CMakeLists.txt
index c760190eb..0ee4acbb6 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/CMakeLists.txt
index add37f10b..2d5c28b6e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/graphics/CMakeLists.txt b/applications/utilities/postProcessing/graphics/CMakeLists.txt
index 885f85a56..78dfb58f8 100644
--- a/applications/utilities/postProcessing/graphics/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV3FoamReader/CMakeLists.txt
index 56bb3b2d3..1f7685df3 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/graphics/PVFoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVFoamReader/CMakeLists.txt
index d6b1289ae..7ccb78674 100644
--- a/applications/utilities/postProcessing/graphics/PVFoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PVFoamReader/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/lagrangian/CMakeLists.txt b/applications/utilities/postProcessing/lagrangian/CMakeLists.txt
index c96a77557..df466ffef 100644
--- a/applications/utilities/postProcessing/lagrangian/CMakeLists.txt
+++ b/applications/utilities/postProcessing/lagrangian/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/miscellaneous/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/CMakeLists.txt
index 3262ebc53..0067fcd59 100644
--- a/applications/utilities/postProcessing/miscellaneous/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/patch/CMakeLists.txt b/applications/utilities/postProcessing/patch/CMakeLists.txt
index b3cd69218..755223567 100644
--- a/applications/utilities/postProcessing/patch/CMakeLists.txt
+++ b/applications/utilities/postProcessing/patch/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/sampling/CMakeLists.txt b/applications/utilities/postProcessing/sampling/CMakeLists.txt
index c4e6df7f4..9d9bfb326 100644
--- a/applications/utilities/postProcessing/sampling/CMakeLists.txt
+++ b/applications/utilities/postProcessing/sampling/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/scalarField/CMakeLists.txt b/applications/utilities/postProcessing/scalarField/CMakeLists.txt
index 87639e9e0..e9c700231 100644
--- a/applications/utilities/postProcessing/scalarField/CMakeLists.txt
+++ b/applications/utilities/postProcessing/scalarField/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/stressField/CMakeLists.txt b/applications/utilities/postProcessing/stressField/CMakeLists.txt
index e0f7dd271..bb087a98a 100644
--- a/applications/utilities/postProcessing/stressField/CMakeLists.txt
+++ b/applications/utilities/postProcessing/stressField/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/turbulence/CMakeLists.txt b/applications/utilities/postProcessing/turbulence/CMakeLists.txt
index 8fc2e09d3..9ef4f830a 100644
--- a/applications/utilities/postProcessing/turbulence/CMakeLists.txt
+++ b/applications/utilities/postProcessing/turbulence/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/velocityField/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/CMakeLists.txt
index b8dcb043c..cc857b3e7 100644
--- a/applications/utilities/postProcessing/velocityField/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/viscoelastic/CMakeLists.txt b/applications/utilities/postProcessing/viscoelastic/CMakeLists.txt
index ee923fb66..300c65621 100644
--- a/applications/utilities/postProcessing/viscoelastic/CMakeLists.txt
+++ b/applications/utilities/postProcessing/viscoelastic/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/postProcessing/wall/CMakeLists.txt b/applications/utilities/postProcessing/wall/CMakeLists.txt
index 86ba595f4..57b3ed38e 100644
--- a/applications/utilities/postProcessing/wall/CMakeLists.txt
+++ b/applications/utilities/postProcessing/wall/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/preProcessing/CMakeLists.txt b/applications/utilities/preProcessing/CMakeLists.txt
index d03757efd..5359ac39f 100644
--- a/applications/utilities/preProcessing/CMakeLists.txt
+++ b/applications/utilities/preProcessing/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/solidMechanics/CMakeLists.txt b/applications/utilities/solidMechanics/CMakeLists.txt
index b7704cd5a..8da11a875 100644
--- a/applications/utilities/solidMechanics/CMakeLists.txt
+++ b/applications/utilities/solidMechanics/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/applications/utilities/thermophysical/CMakeLists.txt b/applications/utilities/thermophysical/CMakeLists.txt
index ff80c7554..3404005a4 100644
--- a/applications/utilities/thermophysical/CMakeLists.txt
+++ b/applications/utilities/thermophysical/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 42523e52f..9fdd833dd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
@@ -60,4 +61,4 @@ add_subdirectory(fvAgglomerationMethods)
 add_subdirectory(meshTools)
 add_subdirectory(dynamicMesh)
 add_subdirectory(thermophysicalModels)
-#add_subdirectory(dbns)
+add_subdirectory(dbns)
diff --git a/src/OSspecific/CMakeLists.txt b/src/OSspecific/CMakeLists.txt
index 57740f874..3dd5d9cb0 100644
--- a/src/OSspecific/CMakeLists.txt
+++ b/src/OSspecific/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/src/cudaSolvers/CMakeLists.txt b/src/cudaSolvers/CMakeLists.txt
index c8042c2e0..40d439181 100644
--- a/src/cudaSolvers/CMakeLists.txt
+++ b/src/cudaSolvers/CMakeLists.txt
@@ -43,4 +43,4 @@ list(APPEND SOURCES
 
 add_foam_library(cudaSolvers SHARED ${SOURCES})
 
-#target_link_libraries(cudaSolvers finiteVolume)
+target_link_libraries(cudaSolvers finiteVolume)
diff --git a/src/dbns/CMakeLists.txt b/src/dbns/CMakeLists.txt
index 0c38550fd..717e19b59 100644
--- a/src/dbns/CMakeLists.txt
+++ b/src/dbns/CMakeLists.txt
@@ -52,4 +52,10 @@ list(APPEND SOURCES
 
 add_foam_library(dbns SHARED ${SOURCES})
 
-target_link_libraries(dbns PUBLIC finiteVolume meshTools basicThermophysicalModels)
+target_link_libraries(dbns ${MGRIDGEN_LIBRARY} compressibleTurbulenceModel)
+
+target_include_directories(dbns PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/dbnsFlux/hllcFlux>
+  $<BUILD_INTERFACE:${MGRIDGEN_INCLUDES}/Lib>
+  $<BUILD_INTERFACE:${MGRIDGEN_INCLUDES}/IMlib>
+)
diff --git a/src/decompositionMethods/CMakeLists.txt b/src/decompositionMethods/CMakeLists.txt
index 7331da3b9..0151b77a0 100644
--- a/src/decompositionMethods/CMakeLists.txt
+++ b/src/decompositionMethods/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/src/dynamicMesh/CMakeLists.txt b/src/dynamicMesh/CMakeLists.txt
index 2e8e6c895..1da97cda2 100644
--- a/src/dynamicMesh/CMakeLists.txt
+++ b/src/dynamicMesh/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/src/dynamicMesh/meshMotion/CMakeLists.txt b/src/dynamicMesh/meshMotion/CMakeLists.txt
index dfcd805b0..bcc1c678c 100644
--- a/src/dynamicMesh/meshMotion/CMakeLists.txt
+++ b/src/dynamicMesh/meshMotion/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/src/finiteVolume/CMakeLists.txt b/src/finiteVolume/CMakeLists.txt
index cef1ac55f..5dd66bf8d 100644
--- a/src/finiteVolume/CMakeLists.txt
+++ b/src/finiteVolume/CMakeLists.txt
@@ -535,3 +535,7 @@ list(APPEND SOURCES
 add_foam_library(finiteVolume SHARED ${SOURCES})
 
 target_link_libraries(finiteVolume PUBLIC meshTools)
+
+target_include_directories(finiteVolume PUBLIC
+$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cfdTools>
+)
diff --git a/src/fvAgglomerationMethods/CMakeLists.txt b/src/fvAgglomerationMethods/CMakeLists.txt
index 157e271d8..f27fab1c6 100644
--- a/src/fvAgglomerationMethods/CMakeLists.txt
+++ b/src/fvAgglomerationMethods/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/src/immersedBoundary/CMakeLists.txt b/src/immersedBoundary/CMakeLists.txt
index b3612a4f7..893bbeb74 100644
--- a/src/immersedBoundary/CMakeLists.txt
+++ b/src/immersedBoundary/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/src/lagrangian/CMakeLists.txt b/src/lagrangian/CMakeLists.txt
index 1a7315331..ad85d276e 100644
--- a/src/lagrangian/CMakeLists.txt
+++ b/src/lagrangian/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/src/lagrangian/molecularDynamics/CMakeLists.txt b/src/lagrangian/molecularDynamics/CMakeLists.txt
index d1a205639..1e77a9845 100644
--- a/src/lagrangian/molecularDynamics/CMakeLists.txt
+++ b/src/lagrangian/molecularDynamics/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/src/mesh/CMakeLists.txt b/src/mesh/CMakeLists.txt
index 63607c2c5..2c5697702 100644
--- a/src/mesh/CMakeLists.txt
+++ b/src/mesh/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/src/postProcessing/CMakeLists.txt b/src/postProcessing/CMakeLists.txt
index 7b3ee7c3a..b81156fd1 100644
--- a/src/postProcessing/CMakeLists.txt
+++ b/src/postProcessing/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/src/postProcessing/functionObjects/CMakeLists.txt b/src/postProcessing/functionObjects/CMakeLists.txt
index a18079c4f..32ed62fc3 100644
--- a/src/postProcessing/functionObjects/CMakeLists.txt
+++ b/src/postProcessing/functionObjects/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/src/thermophysicalModels/CMakeLists.txt b/src/thermophysicalModels/CMakeLists.txt
index 4724a1ce6..3edade63c 100644
--- a/src/thermophysicalModels/CMakeLists.txt
+++ b/src/thermophysicalModels/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/src/transportModels/CMakeLists.txt b/src/transportModels/CMakeLists.txt
index 19bd1595b..ae9189429 100644
--- a/src/transportModels/CMakeLists.txt
+++ b/src/transportModels/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/src/transportModels/incompressible/CMakeLists.txt b/src/transportModels/incompressible/CMakeLists.txt
index 62c428440..daec60119 100644
--- a/src/transportModels/incompressible/CMakeLists.txt
+++ b/src/transportModels/incompressible/CMakeLists.txt
@@ -50,5 +50,4 @@ target_link_libraries(incompressibleTransportModels finiteVolume)
 
 target_include_directories(incompressibleTransportModels PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-#  $<INSTALL_INTERFACE:include/mylib> 
 )
diff --git a/src/turbulenceModels/CMakeLists.txt b/src/turbulenceModels/CMakeLists.txt
index c88ca9021..fe42c4ef2 100644
--- a/src/turbulenceModels/CMakeLists.txt
+++ b/src/turbulenceModels/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/src/turbulenceModels/LES/CMakeLists.txt b/src/turbulenceModels/LES/CMakeLists.txt
index 72d03f745..a494caee7 100644
--- a/src/turbulenceModels/LES/CMakeLists.txt
+++ b/src/turbulenceModels/LES/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/src/turbulenceModels/compressible/CMakeLists.txt b/src/turbulenceModels/compressible/CMakeLists.txt
index e026efb66..1063c706c 100644
--- a/src/turbulenceModels/compressible/CMakeLists.txt
+++ b/src/turbulenceModels/compressible/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/src/turbulenceModels/incompressible/CMakeLists.txt b/src/turbulenceModels/incompressible/CMakeLists.txt
index 631f9b643..c36e7259c 100644
--- a/src/turbulenceModels/incompressible/CMakeLists.txt
+++ b/src/turbulenceModels/incompressible/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
index e971d3224..385d454fa 100644
--- a/tutorials/CMakeLists.txt
+++ b/tutorials/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/basic/CMakeLists.txt b/tutorials/basic/CMakeLists.txt
index cf67cf266..876d99475 100644
--- a/tutorials/basic/CMakeLists.txt
+++ b/tutorials/basic/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/basic/PODSolver/1DPODsin/CMakeLists.txt b/tutorials/basic/PODSolver/1DPODsin/CMakeLists.txt
index f4dc07d6f..f34aca677 100644
--- a/tutorials/basic/PODSolver/1DPODsin/CMakeLists.txt
+++ b/tutorials/basic/PODSolver/1DPODsin/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/basic/PODSolver/CMakeLists.txt b/tutorials/basic/PODSolver/CMakeLists.txt
index 47d07c268..74ec0277f 100644
--- a/tutorials/basic/PODSolver/CMakeLists.txt
+++ b/tutorials/basic/PODSolver/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/basic/potentialFoam/CMakeLists.txt b/tutorials/basic/potentialFoam/CMakeLists.txt
index 36c0d1edd..aae6bcd9b 100644
--- a/tutorials/basic/potentialFoam/CMakeLists.txt
+++ b/tutorials/basic/potentialFoam/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/basic/potentialFoam/cylinder/CMakeLists.txt b/tutorials/basic/potentialFoam/cylinder/CMakeLists.txt
index 2547b3ac4..a7cef6c95 100644
--- a/tutorials/basic/potentialFoam/cylinder/CMakeLists.txt
+++ b/tutorials/basic/potentialFoam/cylinder/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/basic/scalarTransportFoam/CMakeLists.txt b/tutorials/basic/scalarTransportFoam/CMakeLists.txt
index a5df6dae3..cea917f80 100644
--- a/tutorials/basic/scalarTransportFoam/CMakeLists.txt
+++ b/tutorials/basic/scalarTransportFoam/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/basic/scalarTransportFoam/swirlTest/CMakeLists.txt b/tutorials/basic/scalarTransportFoam/swirlTest/CMakeLists.txt
index 3742419b9..4e1eb13f5 100644
--- a/tutorials/basic/scalarTransportFoam/swirlTest/CMakeLists.txt
+++ b/tutorials/basic/scalarTransportFoam/swirlTest/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/compressible/CMakeLists.txt b/tutorials/compressible/CMakeLists.txt
index 8db7e81b7..c040297e4 100644
--- a/tutorials/compressible/CMakeLists.txt
+++ b/tutorials/compressible/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/compressible/rhoCentralFoam/CMakeLists.txt b/tutorials/compressible/rhoCentralFoam/CMakeLists.txt
index d94cf7a6f..4a9d85283 100644
--- a/tutorials/compressible/rhoCentralFoam/CMakeLists.txt
+++ b/tutorials/compressible/rhoCentralFoam/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/CMakeLists.txt b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/CMakeLists.txt
index 5d85c18c7..b699134c9 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/CMakeLists.txt
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/finiteArea/CMakeLists.txt b/tutorials/finiteArea/CMakeLists.txt
index 505bf7efb..c9f2fe833 100644
--- a/tutorials/finiteArea/CMakeLists.txt
+++ b/tutorials/finiteArea/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/finiteArea/liquidFilmFoam/CMakeLists.txt b/tutorials/finiteArea/liquidFilmFoam/CMakeLists.txt
index 278b803ac..817e00b32 100644
--- a/tutorials/finiteArea/liquidFilmFoam/CMakeLists.txt
+++ b/tutorials/finiteArea/liquidFilmFoam/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/CMakeLists.txt b/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/CMakeLists.txt
index 06a6e90af..ba7f0effe 100644
--- a/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/CMakeLists.txt
+++ b/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/finiteArea/surfactantFoam/CMakeLists.txt b/tutorials/finiteArea/surfactantFoam/CMakeLists.txt
index 80ab11157..0bb2f7fa2 100644
--- a/tutorials/finiteArea/surfactantFoam/CMakeLists.txt
+++ b/tutorials/finiteArea/surfactantFoam/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/finiteArea/surfactantFoam/sphereTransport/CMakeLists.txt b/tutorials/finiteArea/surfactantFoam/sphereTransport/CMakeLists.txt
index 8f59abf6a..b7a69308d 100644
--- a/tutorials/finiteArea/surfactantFoam/sphereTransport/CMakeLists.txt
+++ b/tutorials/finiteArea/surfactantFoam/sphereTransport/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/heatTransfer/CMakeLists.txt b/tutorials/heatTransfer/CMakeLists.txt
index 359c0fa13..2a4691dad 100644
--- a/tutorials/heatTransfer/CMakeLists.txt
+++ b/tutorials/heatTransfer/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/CMakeLists.txt b/tutorials/heatTransfer/buoyantPisoFoam/CMakeLists.txt
index 731e3d4c0..5f80c2b86 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/CMakeLists.txt
+++ b/tutorials/heatTransfer/buoyantPisoFoam/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/CMakeLists.txt b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/CMakeLists.txt
index e24fcee83..d767abcfe 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/CMakeLists.txt
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/immersedBoundary/CMakeLists.txt b/tutorials/immersedBoundary/CMakeLists.txt
index d724f10e0..b00eda79f 100644
--- a/tutorials/immersedBoundary/CMakeLists.txt
+++ b/tutorials/immersedBoundary/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/immersedBoundary/sphereInChannel/CMakeLists.txt b/tutorials/immersedBoundary/sphereInChannel/CMakeLists.txt
index e10fc2837..e7523951c 100644
--- a/tutorials/immersedBoundary/sphereInChannel/CMakeLists.txt
+++ b/tutorials/immersedBoundary/sphereInChannel/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/immersedBoundary/thickPlateRefinedMesh/CMakeLists.txt b/tutorials/immersedBoundary/thickPlateRefinedMesh/CMakeLists.txt
index c05232353..1a1ba5913 100644
--- a/tutorials/immersedBoundary/thickPlateRefinedMesh/CMakeLists.txt
+++ b/tutorials/immersedBoundary/thickPlateRefinedMesh/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/incompressible/CMakeLists.txt b/tutorials/incompressible/CMakeLists.txt
index 75afaf363..995eb8540 100644
--- a/tutorials/incompressible/CMakeLists.txt
+++ b/tutorials/incompressible/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/incompressible/icoDyMFoam/CMakeLists.txt b/tutorials/incompressible/icoDyMFoam/CMakeLists.txt
index c1b3d05f8..3844ec576 100644
--- a/tutorials/incompressible/icoDyMFoam/CMakeLists.txt
+++ b/tutorials/incompressible/icoDyMFoam/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/CMakeLists.txt b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/CMakeLists.txt
index d6ad477e4..48373c00b 100644
--- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/CMakeLists.txt
+++ b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/incompressible/icoDyMFoam/movingConeMotion/CMakeLists.txt b/tutorials/incompressible/icoDyMFoam/movingConeMotion/CMakeLists.txt
index 59dca2170..ea7c05e09 100644
--- a/tutorials/incompressible/icoDyMFoam/movingConeMotion/CMakeLists.txt
+++ b/tutorials/incompressible/icoDyMFoam/movingConeMotion/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/lagrangian/CMakeLists.txt b/tutorials/lagrangian/CMakeLists.txt
index 8434d3eed..faf4f04a2 100644
--- a/tutorials/lagrangian/CMakeLists.txt
+++ b/tutorials/lagrangian/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/lagrangian/icoLagrangianFoam/CMakeLists.txt b/tutorials/lagrangian/icoLagrangianFoam/CMakeLists.txt
index 6c396b17c..305f94017 100644
--- a/tutorials/lagrangian/icoLagrangianFoam/CMakeLists.txt
+++ b/tutorials/lagrangian/icoLagrangianFoam/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/CMakeLists.txt b/tutorials/lagrangian/rhoPisoTwinParcelFoam/CMakeLists.txt
index d0d101aaf..42f8deb0e 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/CMakeLists.txt
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/multiphase/CMakeLists.txt b/tutorials/multiphase/CMakeLists.txt
index 7b0928bee..cb387a414 100644
--- a/tutorials/multiphase/CMakeLists.txt
+++ b/tutorials/multiphase/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/multiphase/interDyMFoam/CMakeLists.txt b/tutorials/multiphase/interDyMFoam/CMakeLists.txt
index eda43e6fd..3fa034a4c 100644
--- a/tutorials/multiphase/interDyMFoam/CMakeLists.txt
+++ b/tutorials/multiphase/interDyMFoam/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/multiphase/interDyMFoam/ras/CMakeLists.txt b/tutorials/multiphase/interDyMFoam/ras/CMakeLists.txt
index 7de925e3c..a8cae4fe6 100644
--- a/tutorials/multiphase/interDyMFoam/ras/CMakeLists.txt
+++ b/tutorials/multiphase/interDyMFoam/ras/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/CMakeLists.txt b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/CMakeLists.txt
index 89ae30c69..2a9f5604f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/CMakeLists.txt
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/solidMechanics/CMakeLists.txt b/tutorials/solidMechanics/CMakeLists.txt
index a922b9899..4bf6047eb 100644
--- a/tutorials/solidMechanics/CMakeLists.txt
+++ b/tutorials/solidMechanics/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/solidMechanics/elasticSolidFoam/CMakeLists.txt b/tutorials/solidMechanics/elasticSolidFoam/CMakeLists.txt
index 0a072521e..565a17deb 100644
--- a/tutorials/solidMechanics/elasticSolidFoam/CMakeLists.txt
+++ b/tutorials/solidMechanics/elasticSolidFoam/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/solidMechanics/elasticSolidFoam/plateHole/CMakeLists.txt b/tutorials/solidMechanics/elasticSolidFoam/plateHole/CMakeLists.txt
index 87e7026a6..c48a94be7 100644
--- a/tutorials/solidMechanics/elasticSolidFoam/plateHole/CMakeLists.txt
+++ b/tutorials/solidMechanics/elasticSolidFoam/plateHole/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/solidMechanics/elasticThermalSolidFoam/CMakeLists.txt b/tutorials/solidMechanics/elasticThermalSolidFoam/CMakeLists.txt
index e56612143..af9916043 100644
--- a/tutorials/solidMechanics/elasticThermalSolidFoam/CMakeLists.txt
+++ b/tutorials/solidMechanics/elasticThermalSolidFoam/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/CMakeLists.txt b/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/CMakeLists.txt
index ccb38a012..9c6ac05f8 100644
--- a/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/CMakeLists.txt
+++ b/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org
diff --git a/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/analyticalHotCylinder/CMakeLists.txt b/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/analyticalHotCylinder/CMakeLists.txt
index 0793e874f..9a4c0cbfb 100644
--- a/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/analyticalHotCylinder/CMakeLists.txt
+++ b/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/analyticalHotCylinder/CMakeLists.txt
@@ -1,4 +1,5 @@
-# --------------------------------------------------------------------------#   ========                 |
+# --------------------------------------------------------------------------
+#   ========                 |
 #   \      /  F ield         | foam-extend: Open Source CFD
 #    \    /   O peration     | Version:     4.1
 #     \  /    A nd           | Web:         http://www.foam-extend.org