diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1284ba99d..4d19ced00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,16 +1,17 @@
-# /*-------------------------------------------------------------------------*\#   ========                 |
-#   \\      /  F ield         | foam-extend: Open Source CFD
-#    \\    /   O peration     | Version:     3.2
-#     \\  /    A nd           | Web:         http://www.foam-extend.org
-#      \\/     M anipulation  | For copyright notice see file Copyright
-# -----------------------------------------------------------------------------
+# --------------------------------------------------------------------------
+#   ========                 |
+#   \      /  F ield         | foam-extend: Open Source CFD
+#    \    /   O peration     | Version:     4.1
+#     \  /    A nd           | Web:         http://www.foam-extend.org
+#      \/     M anipulation  | For copyright notice see file Copyright
+# --------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
 #     foam-extend is free software: you can redistribute it and/or modify it
 #     under the terms of the GNU General Public License as published by the
-#     Free Software Foundation, either version 3 of the License, or (at your
-#     option) any later version.
+#     Free Software Foundation, either version 3 of the License, or {at your
+#     option} any later version.
 #
 #     foam-extend is distributed in the hope that it will be useful, but
 #     WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,17 +22,13 @@
 #     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Description
-#     CMakeLists.txt file for implementing a test harness for the compilation
-#     and test of foam-extend-3.2 using Kitware CTest/CMake/CDash
-#
-#     The results will be submitted to the CDash server identified by the file
-#     CTestConfig.cmake
+#     CMakeLists.txt file for libraries and applications
 #
 # Author
-#     Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
 #
 #
-# \*-------------------------------------------------------------------------*/
+# --------------------------------------------------------------------------
 
 cmake_minimum_required (VERSION 2.8)
 
@@ -47,6 +44,7 @@ include(getGitVersion)
 
 add_custom_target(getGitVersion ALL
   COMMAND ${CMAKE_COMMAND} -P cmake/getGitVersion.cmake
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
   COMMENT "Getting GIT version"
 )
 
@@ -79,12 +77,13 @@ find_package(FLEX REQUIRED)
 
 find_package(Git REQUIRED)
 
+find_package(ParaView REQUIRED)
 
 #
 # Recurse into the source
 #
 
-# Set variabable to indicate that we are compiling internally. Used in applications.
+# Set variable to indicate that we are compiling internally. Used in applications.
 set(FOAM_FOUND 1)
 
 # Write something into FOAMTargets.cmake so that we can append to the file.
@@ -95,19 +94,36 @@ add_subdirectory(applications)
 
 
 #
-# Flags and definitions
+# Set default build type
 #
 
-# Define and process the definitions
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release CACHE STRING
+    "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) 
 if(FOAM_PRECISION EQUAL "single")
-  target_compile_definitions(OSspecific PUBLIC -DWM_SP)
+  target_compile_definitions(OSspecific PUBLIC WM_SP)
 else()
-  target_compile_definitions(OSspecific PUBLIC -DWM_SP)
+  target_compile_definitions(OSspecific PUBLIC WM_DP)
 endif()
 
-target_compile_definitions(OSspecific PUBLIC -DNoRepository)
+# No Repository
+target_compile_definitions(OSspecific PUBLIC NoRepository)
+
+# FOAM's full debug mode
+if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+  target_compile_definitions(OSspecific PUBLIC FULLDEBUG)
+  target_compile_options(OSspecific PUBLIC -fdefault-inline -ggdb3)
+endif()
 
 #option(FOAM_PRECISION "help string describing option" -WM_DP)
 
diff --git a/applications/solvers/DNS/dnsFoam/CMakeLists.txt b/applications/solvers/DNS/dnsFoam/CMakeLists.txt
index b28dba55c..7b48964fe 100644
--- a/applications/solvers/DNS/dnsFoam/CMakeLists.txt
+++ b/applications/solvers/DNS/dnsFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   dnsFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(dnsFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/basic/PODSolver/CMakeLists.txt b/applications/solvers/basic/PODSolver/CMakeLists.txt
index 891f83684..2fbeae183 100644
--- a/applications/solvers/basic/PODSolver/CMakeLists.txt
+++ b/applications/solvers/basic/PODSolver/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   PODSolver.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(PODSolver
   DEPENDS POD
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/basic/laplacianFoam/CMakeLists.txt b/applications/solvers/basic/laplacianFoam/CMakeLists.txt
index 80e0613ed..99fe9ea2b 100644
--- a/applications/solvers/basic/laplacianFoam/CMakeLists.txt
+++ b/applications/solvers/basic/laplacianFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   laplacianFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(laplacianFoam
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/basic/potentialDyMFoam/CMakeLists.txt b/applications/solvers/basic/potentialDyMFoam/CMakeLists.txt
index 753dbcfe2..deb8c3036 100644
--- a/applications/solvers/basic/potentialDyMFoam/CMakeLists.txt
+++ b/applications/solvers/basic/potentialDyMFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   potentialDyMFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(potentialDyMFoam
   DEPENDS dynamicFvMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/basic/potentialFoam/CMakeLists.txt b/applications/solvers/basic/potentialFoam/CMakeLists.txt
index cabcece04..b3a75a7cf 100644
--- a/applications/solvers/basic/potentialFoam/CMakeLists.txt
+++ b/applications/solvers/basic/potentialFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   potentialFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(potentialFoam
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/basic/scalarTransportFoam/CMakeLists.txt b/applications/solvers/basic/scalarTransportFoam/CMakeLists.txt
index a0d9c0e8d..d930ccf49 100644
--- a/applications/solvers/basic/scalarTransportFoam/CMakeLists.txt
+++ b/applications/solvers/basic/scalarTransportFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   scalarTransportFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(scalarTransportFoam
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/basic/sixDOFSolver/CMakeLists.txt b/applications/solvers/basic/sixDOFSolver/CMakeLists.txt
index f15be9a3b..75a07bad7 100644
--- a/applications/solvers/basic/sixDOFSolver/CMakeLists.txt
+++ b/applications/solvers/basic/sixDOFSolver/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   sixDOFSolver.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(sixDOFSolver
   DEPENDS meshTools ODE
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/combustion/PDRFoam/CMakeLists.txt b/applications/solvers/combustion/PDRFoam/CMakeLists.txt
index e1d7e4f09..81ff53fad 100644
--- a/applications/solvers/combustion/PDRFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/PDRFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   XiModels/XiModel/XiModel.C
   XiModels/XiModel/newXiModel.C
   XiModels/fixed/fixed.C
@@ -64,5 +64,5 @@ endif()
 
 add_foam_executable(PDRFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/combustion/XiFoam/CMakeLists.txt b/applications/solvers/combustion/XiFoam/CMakeLists.txt
index bbb917fd2..4918638b8 100644
--- a/applications/solvers/combustion/XiFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/XiFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   XiFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(XiFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/combustion/coldEngineFoam/CMakeLists.txt b/applications/solvers/combustion/coldEngineFoam/CMakeLists.txt
index 48b3a59e0..8cf7679bd 100644
--- a/applications/solvers/combustion/coldEngineFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/coldEngineFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   coldEngineFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(coldEngineFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/combustion/dieselEngineFoam/CMakeLists.txt b/applications/solvers/combustion/dieselEngineFoam/CMakeLists.txt
index 19969201e..8c195d391 100644
--- a/applications/solvers/combustion/dieselEngineFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/dieselEngineFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   dieselEngineFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(dieselEngineFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/combustion/dieselFoam/CMakeLists.txt b/applications/solvers/combustion/dieselFoam/CMakeLists.txt
index c847aad5c..59f96a42f 100644
--- a/applications/solvers/combustion/dieselFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/dieselFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   dieselFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(dieselFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/combustion/engineFoam/CMakeLists.txt b/applications/solvers/combustion/engineFoam/CMakeLists.txt
index fd5d46ff9..3f2398763 100644
--- a/applications/solvers/combustion/engineFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/engineFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   engineFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(engineFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/combustion/fireFoam/combustionModels/CMakeLists.txt b/applications/solvers/combustion/fireFoam/combustionModels/CMakeLists.txt
index ff7932d99..578a54d34 100644
--- a/applications/solvers/combustion/fireFoam/combustionModels/CMakeLists.txt
+++ b/applications/solvers/combustion/fireFoam/combustionModels/CMakeLists.txt
@@ -30,15 +30,13 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   combustionModel/combustionModel.C
   combustionModel/newCombustionModel.C
   infinitelyFastChemistry/infinitelyFastChemistry.C
   noCombustion/noCombustion.C
 )
 
-add_foam_library(combustionModels SHARED ${sources})
+add_foam_library(combustionModels SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(combustionModels finiteVolume)
diff --git a/applications/solvers/combustion/reactingFoam/CMakeLists.txt b/applications/solvers/combustion/reactingFoam/CMakeLists.txt
index f9a7253c2..bbaea60ea 100644
--- a/applications/solvers/combustion/reactingFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/reactingFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   reactingFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(reactingFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/combustion/rhoReactingFoam/CMakeLists.txt b/applications/solvers/combustion/rhoReactingFoam/CMakeLists.txt
index ea158caac..a392166ea 100644
--- a/applications/solvers/combustion/rhoReactingFoam/CMakeLists.txt
+++ b/applications/solvers/combustion/rhoReactingFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   rhoReactingFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(rhoReactingFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/dbnsFoam/CMakeLists.txt b/applications/solvers/compressible/dbnsFoam/CMakeLists.txt
index 10d0c6af9..d71153783 100644
--- a/applications/solvers/compressible/dbnsFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/dbnsFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   dbnsFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(dbnsFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/dbnsTurbFoam/CMakeLists.txt b/applications/solvers/compressible/dbnsTurbFoam/CMakeLists.txt
index 5239c7230..e550791c0 100644
--- a/applications/solvers/compressible/dbnsTurbFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/dbnsTurbFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   dbnsTurbFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(dbnsTurbFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/realFluidPisoFoam/CMakeLists.txt b/applications/solvers/compressible/realFluidPisoFoam/CMakeLists.txt
index a49b827e6..7997ca8b6 100644
--- a/applications/solvers/compressible/realFluidPisoFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/realFluidPisoFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   realFluidPisoFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(realFluidPisoFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/CMakeLists.txt b/applications/solvers/compressible/rhoCentralFoam/BCs/CMakeLists.txt
index c58d9332d..6729595f7 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/CMakeLists.txt
@@ -30,15 +30,13 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   mixedFixedValueSlip/mixedFixedValueSlipFvPatchFields.C
   U/maxwellSlipUFvPatchVectorField.C
   T/smoluchowskiJumpTFvPatchScalarField.C
   rho/fixedRhoFvPatchScalarField.C
 )
 
-add_foam_library(rhoCentralFoam SHARED ${sources})
+add_foam_library(rhoCentralFoam SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(rhoCentralFoam finiteVolume)
diff --git a/applications/solvers/compressible/rhoPimpleFoam/CMakeLists.txt b/applications/solvers/compressible/rhoPimpleFoam/CMakeLists.txt
index 647596668..c0e5572be 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoPimpleFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   rhoPimpleFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(rhoPimpleFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/rhoPisoFoam/CMakeLists.txt b/applications/solvers/compressible/rhoPisoFoam/CMakeLists.txt
index 1692c6102..18f08fbb5 100644
--- a/applications/solvers/compressible/rhoPisoFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoPisoFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   rhoPisoFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(rhoPisoFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/CMakeLists.txt b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/CMakeLists.txt
index a70e6cf1c..3aafc1900 100644
--- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   rhoPorousMRFPimpleFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(rhoPorousMRFPimpleFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/CMakeLists.txt b/applications/solvers/compressible/rhoPorousSimpleFoam/CMakeLists.txt
index ea3e1e34c..49b4e72c1 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   rhoPorousSimpleFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(rhoPorousSimpleFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/rhoSimpleFoam/CMakeLists.txt b/applications/solvers/compressible/rhoSimpleFoam/CMakeLists.txt
index 7e29c7930..f90f09149 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoSimpleFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   rhoSimpleFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(rhoSimpleFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/rhoSonicFoam/CMakeLists.txt b/applications/solvers/compressible/rhoSonicFoam/CMakeLists.txt
index 64110b943..66c33dd12 100644
--- a/applications/solvers/compressible/rhoSonicFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/rhoSonicFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   rhoSonicFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(rhoSonicFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/rhopSonicFoam/BCs/CMakeLists.txt b/applications/solvers/compressible/rhopSonicFoam/BCs/CMakeLists.txt
index 8e188b0de..1c519a14b 100644
--- a/applications/solvers/compressible/rhopSonicFoam/BCs/CMakeLists.txt
+++ b/applications/solvers/compressible/rhopSonicFoam/BCs/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   rho/fixedRhoFvPatchScalarField.C
   rho/gradientRhoFvPatchScalarField.C
   rhoE/fixedRhoEFvPatchScalarField.C
@@ -39,8 +39,6 @@ list(APPEND sources
   p/inviscidWallPFvPatchScalarField.C
 )
 
-add_foam_library(rhopSonicFoam SHARED ${sources})
+add_foam_library(rhopSonicFoam SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(rhopSonicFoam finiteVolume)
diff --git a/applications/solvers/compressible/sonicDyMFoam/CMakeLists.txt b/applications/solvers/compressible/sonicDyMFoam/CMakeLists.txt
index bf68e0ed0..49ac038c6 100644
--- a/applications/solvers/compressible/sonicDyMFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/sonicDyMFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   sonicDyMFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(sonicDyMFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/sonicFoam/CMakeLists.txt b/applications/solvers/compressible/sonicFoam/CMakeLists.txt
index ad585a479..231e3fc06 100644
--- a/applications/solvers/compressible/sonicFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/sonicFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   sonicFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(sonicFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/sonicLiquidFoam/CMakeLists.txt b/applications/solvers/compressible/sonicLiquidFoam/CMakeLists.txt
index e809752ef..b5556ca55 100644
--- a/applications/solvers/compressible/sonicLiquidFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/sonicLiquidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   sonicLiquidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(sonicLiquidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/steadyCompressibleFoam/CMakeLists.txt b/applications/solvers/compressible/steadyCompressibleFoam/CMakeLists.txt
index 845db38f5..6b6bf38b1 100644
--- a/applications/solvers/compressible/steadyCompressibleFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/steadyCompressibleFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   steadyCompressibleFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(steadyCompressibleFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/steadyCompressibleMRFFoam/CMakeLists.txt b/applications/solvers/compressible/steadyCompressibleMRFFoam/CMakeLists.txt
index f67a0747f..8eaf88a91 100644
--- a/applications/solvers/compressible/steadyCompressibleMRFFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/steadyCompressibleMRFFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   steadyCompressibleMRFFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(steadyCompressibleMRFFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/steadyCompressibleSRFFoam/CMakeLists.txt b/applications/solvers/compressible/steadyCompressibleSRFFoam/CMakeLists.txt
index dab8c77fd..ec68a7217 100644
--- a/applications/solvers/compressible/steadyCompressibleSRFFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/steadyCompressibleSRFFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   steadyCompressibleSRFFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(steadyCompressibleSRFFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/steadyUniversalFoam/CMakeLists.txt b/applications/solvers/compressible/steadyUniversalFoam/CMakeLists.txt
index d5c1f3211..725aa4451 100644
--- a/applications/solvers/compressible/steadyUniversalFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/steadyUniversalFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   steadyUniversalFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(steadyUniversalFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/compressible/steadyUniversalMRFFoam/CMakeLists.txt b/applications/solvers/compressible/steadyUniversalMRFFoam/CMakeLists.txt
index c628285e5..519642616 100644
--- a/applications/solvers/compressible/steadyUniversalMRFFoam/CMakeLists.txt
+++ b/applications/solvers/compressible/steadyUniversalMRFFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   steadyUniversalMRFFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(steadyUniversalMRFFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/coupled/MRFPorousFoam/CMakeLists.txt b/applications/solvers/coupled/MRFPorousFoam/CMakeLists.txt
index 9de8bf38b..170684545 100644
--- a/applications/solvers/coupled/MRFPorousFoam/CMakeLists.txt
+++ b/applications/solvers/coupled/MRFPorousFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   MRFPorousFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(MRFPorousFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/coupled/blockCoupledScalarTransportFoam/CMakeLists.txt b/applications/solvers/coupled/blockCoupledScalarTransportFoam/CMakeLists.txt
index c89902cd1..f18b8a255 100644
--- a/applications/solvers/coupled/blockCoupledScalarTransportFoam/CMakeLists.txt
+++ b/applications/solvers/coupled/blockCoupledScalarTransportFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   blockCoupledScalarTransportFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(blockCoupledScalarTransportFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/coupled/conjugateHeatFoam/CMakeLists.txt b/applications/solvers/coupled/conjugateHeatFoam/CMakeLists.txt
index 83439a3b0..7a1c20e41 100644
--- a/applications/solvers/coupled/conjugateHeatFoam/CMakeLists.txt
+++ b/applications/solvers/coupled/conjugateHeatFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   conjugateHeatFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(conjugateHeatFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/coupled/conjugateHeatSimpleFoam/CMakeLists.txt b/applications/solvers/coupled/conjugateHeatSimpleFoam/CMakeLists.txt
index a1af42861..68fe48014 100644
--- a/applications/solvers/coupled/conjugateHeatSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/coupled/conjugateHeatSimpleFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   conjugateHeatSimpleFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(conjugateHeatSimpleFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/coupled/conjugateHeatTransfer/CMakeLists.txt b/applications/solvers/coupled/conjugateHeatTransfer/CMakeLists.txt
index 1a159fba7..50b97a440 100644
--- a/applications/solvers/coupled/conjugateHeatTransfer/CMakeLists.txt
+++ b/applications/solvers/coupled/conjugateHeatTransfer/CMakeLists.txt
@@ -30,12 +30,12 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   thermalModel/thermalModel.C
 )
 set(thermalLaws thermalModel/thermalLaws)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${thermalLaws}/thermalLaw/thermalLaw.C
   ${thermalLaws}/thermalLaw/newThermalLaw.C
   ${thermalLaws}/constantThermal/constantThermal.C
@@ -45,7 +45,7 @@ list(APPEND sources
 
 set(thermalGaps thermalModel/thermalGaps)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${thermalGaps}/thermalGap/thermalGap.C
   ${thermalGaps}/thermalGap/newThermalGap.C
   ${thermalGaps}/constantThermalGap/constantThermalGap.C
@@ -54,7 +54,7 @@ list(APPEND sources
 
 set(thermalSource thermalModel/thermalSource)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${thermalSource}/thermalSource/thermalSource.C
   ${thermalSource}/thermalSource/newThermalSource.C
   ${thermalSource}/constantThermalSource/constantThermalSource.C
@@ -62,7 +62,7 @@ list(APPEND sources
 
 set(BCs fvPatchFields)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${BCs}/controlledParabolicVelocity/controlledParabolicVelocityFvPatchVectorField.C
   ${BCs}/chtRegionCoupleBase/chtRegionCoupleBase.C
   ${BCs}/chtRcThermalDiffusivity/chtRcThermalDiffusivityFvPatchScalarField.C
@@ -82,13 +82,11 @@ list(APPEND sources
 
 set(FOs functionObjects)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${FOs}/heatFlux/heatFlux/heatFlux.C
   ${FOs}/heatFlux/heatFluxFunctionObject/heatFluxFunctionObject.C
 )
 
-add_foam_library(conjugateHeatTransfer SHARED ${sources})
+add_foam_library(conjugateHeatTransfer SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(conjugateHeatTransfer finiteVolume)
diff --git a/applications/solvers/coupled/pUCoupledFoam/CMakeLists.txt b/applications/solvers/coupled/pUCoupledFoam/CMakeLists.txt
index 954f13306..76c480b61 100644
--- a/applications/solvers/coupled/pUCoupledFoam/CMakeLists.txt
+++ b/applications/solvers/coupled/pUCoupledFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   pUCoupledFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(pUCoupledFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/discreteMethods/dsmc/dsmcFoam/CMakeLists.txt b/applications/solvers/discreteMethods/dsmc/dsmcFoam/CMakeLists.txt
index 32bcebe7d..e8b1c2ce5 100644
--- a/applications/solvers/discreteMethods/dsmc/dsmcFoam/CMakeLists.txt
+++ b/applications/solvers/discreteMethods/dsmc/dsmcFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   dsmcFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(dsmcFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/CMakeLists.txt b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/CMakeLists.txt
index f88edc19f..1dc638fd6 100644
--- a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/CMakeLists.txt
+++ b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   mdEquilibrationFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(mdEquirationFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/CMakeLists.txt b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/CMakeLists.txt
index a48df4cea..19fc7931c 100644
--- a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/CMakeLists.txt
+++ b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   mdFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(mdFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/electromagnetics/electrostaticFoam/CMakeLists.txt b/applications/solvers/electromagnetics/electrostaticFoam/CMakeLists.txt
index 4b5e851c8..f7639cca3 100644
--- a/applications/solvers/electromagnetics/electrostaticFoam/CMakeLists.txt
+++ b/applications/solvers/electromagnetics/electrostaticFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   electrostaticFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(electrostaticFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/electromagnetics/mhdFoam/CMakeLists.txt b/applications/solvers/electromagnetics/mhdFoam/CMakeLists.txt
index 6a26c47c1..b4b13e321 100644
--- a/applications/solvers/electromagnetics/mhdFoam/CMakeLists.txt
+++ b/applications/solvers/electromagnetics/mhdFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   mhdFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(mhdFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/engine/icoDyMEngineFoam/CMakeLists.txt b/applications/solvers/engine/icoDyMEngineFoam/CMakeLists.txt
index 4f6c8169e..fb18a098a 100644
--- a/applications/solvers/engine/icoDyMEngineFoam/CMakeLists.txt
+++ b/applications/solvers/engine/icoDyMEngineFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   icoDyMEngineFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(icoDyMEngineFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/CMakeLists.txt b/applications/solvers/engine/sonicTurbDyMEngineFoam/CMakeLists.txt
index 67ef9e821..5e83c7857 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/CMakeLists.txt
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   sonicTurbDyMEngineFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(sonicTurbDyMEngineFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/engine/turbDyMEngineFoam/CMakeLists.txt b/applications/solvers/engine/turbDyMEngineFoam/CMakeLists.txt
index 5bc833845..8b3ceb2d2 100644
--- a/applications/solvers/engine/turbDyMEngineFoam/CMakeLists.txt
+++ b/applications/solvers/engine/turbDyMEngineFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   turbDyMEngineFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(turbDyMEngineFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/equationReaderDemo/CMakeLists.txt b/applications/solvers/equationReaderDemo/CMakeLists.txt
index 1721b8d7a..fa0838428 100644
--- a/applications/solvers/equationReaderDemo/CMakeLists.txt
+++ b/applications/solvers/equationReaderDemo/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   equationReaderDemo.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(equationReaderDemo
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/financial/financialFoam/CMakeLists.txt b/applications/solvers/financial/financialFoam/CMakeLists.txt
index 54cb33155..4b78839e9 100644
--- a/applications/solvers/financial/financialFoam/CMakeLists.txt
+++ b/applications/solvers/financial/financialFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   financialFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(financialFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/finiteArea/liquidFilmFoam/CMakeLists.txt b/applications/solvers/finiteArea/liquidFilmFoam/CMakeLists.txt
index e41330201..ae7dc9265 100644
--- a/applications/solvers/finiteArea/liquidFilmFoam/CMakeLists.txt
+++ b/applications/solvers/finiteArea/liquidFilmFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   liquidFilmFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(liquidFilmFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/finiteArea/surfactantFoam/CMakeLists.txt b/applications/solvers/finiteArea/surfactantFoam/CMakeLists.txt
index a6d33439e..1769dc04b 100644
--- a/applications/solvers/finiteArea/surfactantFoam/CMakeLists.txt
+++ b/applications/solvers/finiteArea/surfactantFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfactantFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfactantFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/heatTransfer/boussinesqBuoyantFoam/CMakeLists.txt b/applications/solvers/heatTransfer/boussinesqBuoyantFoam/CMakeLists.txt
index 3c25228f7..a5988da66 100644
--- a/applications/solvers/heatTransfer/boussinesqBuoyantFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/boussinesqBuoyantFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   boussinesqBuoyantFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(boussinesqBuoyantFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/CMakeLists.txt b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/CMakeLists.txt
index d3199041a..27c6ff919 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   buoyantBoussinesqPisoFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(buoyantBoussinesqPisoFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/CMakeLists.txt b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/CMakeLists.txt
index ddd97bf76..113baa1bf 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   buoyantBoussinesqSimpleFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(buoyantBoussinesqSimpleFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/CMakeLists.txt b/applications/solvers/heatTransfer/buoyantPisoFoam/CMakeLists.txt
index d339fad84..25f922bdf 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   buoyantPisoFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(buoyantPisoFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/CMakeLists.txt b/applications/solvers/heatTransfer/buoyantSimpleFoam/CMakeLists.txt
index 32baa7951..e42430922 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   buoyantSimpleFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(buoyantSimpleFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/CMakeLists.txt b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/CMakeLists.txt
index e2fe1dc0a..1d2d3eaf3 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   buoyantSimpleRadiationFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(buoyantSimpleRadiationFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/CMakeLists.txt b/applications/solvers/heatTransfer/chtMultiRegionFoam/CMakeLists.txt
index 7c84678ea..894430d35 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   regionProperties/regionProperties.C
   derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.C
   derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.C
@@ -47,5 +47,5 @@ endif()
 
 add_foam_executable(chtMultiRegionFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/CMakeLists.txt b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/CMakeLists.txt
index 63791deeb..3cc3b000a 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.C
   chtMultiRegionSimpleFoam.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(chtMultiRegionSimpleFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/immersedBoundary/icoDyMIbFoam/CMakeLists.txt b/applications/solvers/immersedBoundary/icoDyMIbFoam/CMakeLists.txt
index 9850de6b2..4f08b7e28 100644
--- a/applications/solvers/immersedBoundary/icoDyMIbFoam/CMakeLists.txt
+++ b/applications/solvers/immersedBoundary/icoDyMIbFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   icoDyMIbFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(icoDyMIbFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/immersedBoundary/icoIbFoam/CMakeLists.txt b/applications/solvers/immersedBoundary/icoIbFoam/CMakeLists.txt
index 3793751ab..627967ea0 100644
--- a/applications/solvers/immersedBoundary/icoIbFoam/CMakeLists.txt
+++ b/applications/solvers/immersedBoundary/icoIbFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   icoIbFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(icoIbFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/immersedBoundary/interIbFoam/CMakeLists.txt b/applications/solvers/immersedBoundary/interIbFoam/CMakeLists.txt
index 97849df15..43472e250 100644
--- a/applications/solvers/immersedBoundary/interIbFoam/CMakeLists.txt
+++ b/applications/solvers/immersedBoundary/interIbFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   interIbFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(interIbFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/immersedBoundary/porousSimpleIbFoam/CMakeLists.txt b/applications/solvers/immersedBoundary/porousSimpleIbFoam/CMakeLists.txt
index 6ac1bce83..95cef4f61 100644
--- a/applications/solvers/immersedBoundary/porousSimpleIbFoam/CMakeLists.txt
+++ b/applications/solvers/immersedBoundary/porousSimpleIbFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   porousSimpleIbFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(porousSimpleIbFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/immersedBoundary/potentialIbFoam/CMakeLists.txt b/applications/solvers/immersedBoundary/potentialIbFoam/CMakeLists.txt
index 772d731d7..17ec20f55 100644
--- a/applications/solvers/immersedBoundary/potentialIbFoam/CMakeLists.txt
+++ b/applications/solvers/immersedBoundary/potentialIbFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   potentialIbFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(potentialIbFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/immersedBoundary/simpleIbFoam/CMakeLists.txt b/applications/solvers/immersedBoundary/simpleIbFoam/CMakeLists.txt
index ca5e8c6a7..23e449a1f 100644
--- a/applications/solvers/immersedBoundary/simpleIbFoam/CMakeLists.txt
+++ b/applications/solvers/immersedBoundary/simpleIbFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   simpleIbFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(simpleIbFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/incompressible/MRFSimpleFoam/CMakeLists.txt b/applications/solvers/incompressible/MRFSimpleFoam/CMakeLists.txt
index ddaab2666..faa90212b 100644
--- a/applications/solvers/incompressible/MRFSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/MRFSimpleFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   MRFSimpleFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(MRFSimpleFoam
   DEPENDS incompressibleRASModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/incompressible/boundaryFoam/CMakeLists.txt b/applications/solvers/incompressible/boundaryFoam/CMakeLists.txt
index c03739323..cb0a1c631 100644
--- a/applications/solvers/incompressible/boundaryFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/boundaryFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   boundaryFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(boundaryFoam
   DEPENDS incompressibleRASModels sampling
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/incompressible/channelFoam/CMakeLists.txt b/applications/solvers/incompressible/channelFoam/CMakeLists.txt
index c6cab4d01..0ae8a9a7f 100644
--- a/applications/solvers/incompressible/channelFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/channelFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   channelFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(channelFoam
   DEPENDS incompressibleLESModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/incompressible/icoDyMFoam/CMakeLists.txt b/applications/solvers/incompressible/icoDyMFoam/CMakeLists.txt
index 4f814bc13..ddfcaaacf 100644
--- a/applications/solvers/incompressible/icoDyMFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/icoDyMFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   icoDyMFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(icoDyMFoam
   DEPENDS dynamicFvMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/CMakeLists.txt b/applications/solvers/incompressible/icoDyMSimpleFoam/CMakeLists.txt
index 7d0d3f5b0..55e5e761d 100644
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   icoDyMSimpleFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(icoDyMSimpleFoam
   DEPENDS dynamicFvMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/incompressible/icoFoam/CMakeLists.txt b/applications/solvers/incompressible/icoFoam/CMakeLists.txt
index 4d2881bb8..7b061f23b 100644
--- a/applications/solvers/incompressible/icoFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/icoFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   icoFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(icoFoam
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/CMakeLists.txt b/applications/solvers/incompressible/nonNewtonianIcoFoam/CMakeLists.txt
index 2677c3fa0..4ac55c9c8 100644
--- a/applications/solvers/incompressible/nonNewtonianIcoFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   nonNewtonianIcoFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(nonNewtonianIcoFoam
   DEPENDS incompressibleTransportModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/CMakeLists.txt b/applications/solvers/incompressible/pimpleDyMFoam/CMakeLists.txt
index dacb029a5..ee04c78fa 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/pimpleDyMFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   pimpleDyMFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(pimpleDyMFoam
   DEPENDS dynamicFvMesh incompressibleRASModels incompressibleLESModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/incompressible/pimpleFoam/CMakeLists.txt b/applications/solvers/incompressible/pimpleFoam/CMakeLists.txt
index ad6e3719a..573bd5253 100644
--- a/applications/solvers/incompressible/pimpleFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/pimpleFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   pimpleFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(pimpleFoam
   DEPENDS incompressibleRASModels incompressibleLESModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/incompressible/pisoFoam/CMakeLists.txt b/applications/solvers/incompressible/pisoFoam/CMakeLists.txt
index 4540a3901..2522f644f 100644
--- a/applications/solvers/incompressible/pisoFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/pisoFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   pisoFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(pisoFoam
   DEPENDS incompressibleRASModels incompressibleLESModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/incompressible/porousSimpleFoam/CMakeLists.txt b/applications/solvers/incompressible/porousSimpleFoam/CMakeLists.txt
index 87ddaca05..093cf1dcb 100644
--- a/applications/solvers/incompressible/porousSimpleFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/porousSimpleFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   porousSimpleFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(porousSimpleFoam
   DEPENDS incompressibleRASModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/incompressible/shallowWaterFoam/CMakeLists.txt b/applications/solvers/incompressible/shallowWaterFoam/CMakeLists.txt
index 1af199e2c..d524d111e 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/shallowWaterFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   shallowWaterFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(shallowWaterFoam
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/incompressible/simpleFoam/CMakeLists.txt b/applications/solvers/incompressible/simpleFoam/CMakeLists.txt
index 426b83a48..36ebd441b 100644
--- a/applications/solvers/incompressible/simpleFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/simpleFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   simpleFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(simpleFoam
   DEPENDS incompressibleRASModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/incompressible/simpleSRFFoam/CMakeLists.txt b/applications/solvers/incompressible/simpleSRFFoam/CMakeLists.txt
index fdaba40c5..2f0c47d29 100644
--- a/applications/solvers/incompressible/simpleSRFFoam/CMakeLists.txt
+++ b/applications/solvers/incompressible/simpleSRFFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   simpleSRFFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(simpleSRFFoam
   DEPENDS incompressibleRASModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/CMakeLists.txt b/applications/solvers/lagrangian/coalChemistryFoam/CMakeLists.txt
index c64c5b365..83b524a4d 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/CMakeLists.txt
+++ b/applications/solvers/lagrangian/coalChemistryFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   coalChemistryFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(coalChemistryFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/CMakeLists.txt b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/CMakeLists.txt
index 8f12269aa..71f7c48c8 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/CMakeLists.txt
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   porousExplicitSourceReactingParcelFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(porousExplicitSourceReactingParcelFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/CMakeLists.txt b/applications/solvers/lagrangian/reactingParcelFoam/CMakeLists.txt
index a6136c8e2..2c2636879 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/CMakeLists.txt
+++ b/applications/solvers/lagrangian/reactingParcelFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   reactingParcelFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(reactingParcelFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/CMakeLists.txt b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/CMakeLists.txt
index bb9feac99..78291584b 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/CMakeLists.txt
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   uncoupledKinematicParcelFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(uncoupledKinematicParcelFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiSolver/multiSolverDemo/CMakeLists.txt b/applications/solvers/multiSolver/multiSolverDemo/CMakeLists.txt
index c8c89ca68..1ff23bbd8 100644
--- a/applications/solvers/multiSolver/multiSolverDemo/CMakeLists.txt
+++ b/applications/solvers/multiSolver/multiSolverDemo/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   multiSolverDemo.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(multiSolverDemo
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/MRFInterFoam/CMakeLists.txt b/applications/solvers/multiphase/MRFInterFoam/CMakeLists.txt
index 0a3019c43..45bb31fa6 100644
--- a/applications/solvers/multiphase/MRFInterFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/MRFInterFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   MRFInterFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(MRFInterFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/barotropicCavitatingFoam/CMakeLists.txt b/applications/solvers/multiphase/barotropicCavitatingFoam/CMakeLists.txt
index 0466f7274..dfae93e0a 100644
--- a/applications/solvers/multiphase/barotropicCavitatingFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/barotropicCavitatingFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   barotropicCavitatingFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(barotropicCavitatingFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/bubbleFoam/CMakeLists.txt b/applications/solvers/multiphase/bubbleFoam/CMakeLists.txt
index 22f8892f5..3aa131b09 100644
--- a/applications/solvers/multiphase/bubbleFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/bubbleFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   bubbleFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(bubbleFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/cavitatingFoam/CMakeLists.txt b/applications/solvers/multiphase/cavitatingFoam/CMakeLists.txt
index f74511e9c..2ce310d09 100644
--- a/applications/solvers/multiphase/cavitatingFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/cavitatingFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   cavitatingFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(cavitatingFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/CMakeLists.txt b/applications/solvers/multiphase/compressibleInterDyMFoam/CMakeLists.txt
index 9b5b2fbb6..87a91c4c0 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   compressibleInterDyMFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(compressibleInterDyMFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/compressibleInterFoam/CMakeLists.txt b/applications/solvers/multiphase/compressibleInterFoam/CMakeLists.txt
index daf216525..678f237a5 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/compressibleInterFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   compressibleInterFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(compressibleInterFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/interDyMFoam/CMakeLists.txt b/applications/solvers/multiphase/interDyMFoam/CMakeLists.txt
index da8968687..4c1c523c2 100644
--- a/applications/solvers/multiphase/interDyMFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/interDyMFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   interDyMFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(interDyMFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/interFoam/CMakeLists.txt b/applications/solvers/multiphase/interFoam/CMakeLists.txt
index dd9401100..fd2e0b8b2 100644
--- a/applications/solvers/multiphase/interFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/interFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   interFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(interFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/interMixingFoam/CMakeLists.txt b/applications/solvers/multiphase/interMixingFoam/CMakeLists.txt
index e7af67713..a6e27125b 100644
--- a/applications/solvers/multiphase/interMixingFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/interMixingFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   incompressibleThreePhaseMixture/threePhaseMixture.C
   threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
   interMixingFoam.C
@@ -44,5 +44,5 @@ endif()
 
 add_foam_executable(interMixingFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/CMakeLists.txt b/applications/solvers/multiphase/interPhaseChangeFoam/CMakeLists.txt
index 9b216435a..a7d80254a 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   interPhaseChangeFoam.C
   phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
   phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
@@ -47,5 +47,5 @@ endif()
 
 add_foam_executable(interPhaseChangeFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/CMakeLists.txt b/applications/solvers/multiphase/multiphaseInterFoam/CMakeLists.txt
index eddb42816..488b99c71 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/multiphaseInterFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   multiphaseMixture/phase/phase.C
   multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.C
   multiphaseMixture/multiphaseMixture.C
@@ -45,5 +45,5 @@ endif()
 
 add_foam_executable(multiphaseInterFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/porousInterFoam/CMakeLists.txt b/applications/solvers/multiphase/porousInterFoam/CMakeLists.txt
index 48971a1c3..1409915cd 100644
--- a/applications/solvers/multiphase/porousInterFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/porousInterFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   porousInterFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(porousInterFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/settlingFoam/CMakeLists.txt b/applications/solvers/multiphase/settlingFoam/CMakeLists.txt
index c7c556ed9..f936b5f40 100644
--- a/applications/solvers/multiphase/settlingFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/settlingFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   settlingFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(settlingFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/CMakeLists.txt b/applications/solvers/multiphase/twoLiquidMixingFoam/CMakeLists.txt
index 711731760..ac531cd5d 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   twoLiquidMixingFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(twoLiquidMixingFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt
index 247813536..c4619742e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   dragModels/dragModel/dragModel.C
   dragModels/dragModel/newDragModel.C
   dragModels/Ergun/Ergun.C
@@ -42,8 +42,6 @@ list(APPEND sources
   dragModels/SyamlalOBrien/SyamlalOBrien.C
 )
 
-add_foam_library(EulerianInterfacialModels SHARED ${sources})
+add_foam_library(EulerianInterfacialModels SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(EulerianInterfacialModels finiteVolume)
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt
index b46144113..b609a4c13 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   kineticTheoryModel/kineticTheoryModel.C
   viscosityModel/viscosityModel/kineticTheoryViscosityModel.C
   viscosityModel/viscosityModel/newKineticTheoryViscosityModel.C
@@ -59,8 +59,6 @@ list(APPEND sources
   frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
 )
 
-add_foam_library(kineticTheoryModel SHARED ${sources})
+add_foam_library(kineticTheoryModel SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(kineticTheoryModel finiteVolume)
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/CMakeLists.txt b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/CMakeLists.txt
index 2bd5b55ad..db288e4c2 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/CMakeLists.txt
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/CMakeLists.txt
@@ -30,12 +30,10 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   phaseModel/phaseModel.C
 )
 
-add_foam_library(phaseModel SHARED ${sources})
+add_foam_library(phaseModel SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(phaseModel finiteVolume)
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/CMakeLists.txt b/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/CMakeLists.txt
index 21a815cf7..ec3c3b757 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   contactPatchPair.C
   contactPatchPairUpdateContact.C
   contactPatchPairSlavePressure.C
@@ -45,5 +45,5 @@ endif()
 
 add_foam_executable(contactStressFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/CMakeLists.txt b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/CMakeLists.txt
index ff4e0ec22..0ac795db1 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   tractionDisplacement/tractionDisplacementFvPatchVectorField.C
   icoFsiFoam.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(icoFsiFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/CMakeLists.txt b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/CMakeLists.txt
index dfacebd02..ad5ec3095 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/materialModels/CMakeLists.txt
@@ -30,12 +30,12 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   rheologyModel/rheologyModel.C
 )
 set(rheologyLaws rheologyModel/rheologyLaws)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${rheologyLaws}/rheologyLaw/rheologyLaw.C
   ${rheologyLaws}/rheologyLaw/newRheologyLaw.C
   ${rheologyLaws}/linearElastic/linearElastic.C
@@ -50,7 +50,7 @@ list(APPEND sources
 )
 set(thermalLaws thermalModel/thermalLaws)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${thermalLaws}/thermalLaw/thermalLaw.C
   ${thermalLaws}/thermalLaw/newThermalLaw.C
   ${thermalLaws}/constantThermal/constantThermal.C
@@ -66,8 +66,6 @@ list(APPEND sources
   fvPatchFields/cohesiveZone/cohesiveZoneFvPatchVectorField.C
 )
 
-add_foam_library(materialModels SHARED ${sources})
+add_foam_library(materialModels SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(materialModels finiteVolume)
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/CMakeLists.txt b/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/CMakeLists.txt
index 41f392207..bed60d313 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/newContactStressFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   contactProblem.C
   contactPatchPair.C
   newContactStressFoam.C
@@ -44,5 +44,5 @@ endif()
 
 add_foam_executable(newContactStressFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/newStressedFoam/CMakeLists.txt b/applications/solvers/solidMechanics/deprecatedSolvers/newStressedFoam/CMakeLists.txt
index 362924442..438787650 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/newStressedFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/newStressedFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   newStressedFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(newStressedFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/CMakeLists.txt b/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/CMakeLists.txt
index 2de19658b..22333d16b 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   tractionDisplacement/tractionDisplacementFvPatchVectorField.C
   solidDisplacementFoam.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(solidDisplacementFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/solidEquilibriumDisplacementFoam/CMakeLists.txt b/applications/solvers/solidMechanics/deprecatedSolvers/solidEquilibriumDisplacementFoam/CMakeLists.txt
index c2bf131a6..61bc95f70 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/solidEquilibriumDisplacementFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/solidEquilibriumDisplacementFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
   solidEquilibriumDisplacementFoam.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(solidEquiriumDisplacementFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/CMakeLists.txt b/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/CMakeLists.txt
index b1d3bf8ad..2b7caf2c5 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   tractionDisplacement/tractionDisplacementFvPatchVectorField.C
   stressedFoam.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(stressedFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticAcpSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticAcpSolidFoam/CMakeLists.txt
index 38bac0f16..1c1ca746d 100644
--- a/applications/solvers/solidMechanics/elasticAcpSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticAcpSolidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   elasticAcpSolidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(elasticAcpSolidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticIncrAcpSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticIncrAcpSolidFoam/CMakeLists.txt
index cbe8e5cf1..0bac43415 100644
--- a/applications/solvers/solidMechanics/elasticIncrAcpSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticIncrAcpSolidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   elasticIncrAcpSolidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(elasticIncrAcpSolidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticIncrSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticIncrSolidFoam/CMakeLists.txt
index 1b424e9ea..e69869502 100644
--- a/applications/solvers/solidMechanics/elasticIncrSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticIncrSolidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   elasticIncrSolidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(elasticIncrSolidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticNonLinIncrTLSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticNonLinIncrTLSolidFoam/CMakeLists.txt
index 53a86fb1b..5712f2a0a 100644
--- a/applications/solvers/solidMechanics/elasticNonLinIncrTLSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticNonLinIncrTLSolidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   elasticNonLinIncrTLSolidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(elasticNonLinIncrTLSolidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/CMakeLists.txt
index 5bf44b6bc..72073b7bb 100644
--- a/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   elasticNonLinTLSolidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(elasticNonLinTLSolidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/CMakeLists.txt
index 01873f032..d01e22a7d 100644
--- a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   elasticNonLinULSolidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(elasticNonLinULSolidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticOrthoAcpSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticOrthoAcpSolidFoam/CMakeLists.txt
index 89bea1720..7bfddc035 100644
--- a/applications/solvers/solidMechanics/elasticOrthoAcpSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticOrthoAcpSolidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   elasticOrthoAcpSolidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(elasticOrthoAcpSolidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticOrthoNonLinULSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticOrthoNonLinULSolidFoam/CMakeLists.txt
index 8fecb32ef..5550ba1e1 100644
--- a/applications/solvers/solidMechanics/elasticOrthoNonLinULSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticOrthoNonLinULSolidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   elasticOrthoNonLinULSolidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(elasticOrthoNonLinULSolidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticOrthoSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticOrthoSolidFoam/CMakeLists.txt
index 1ff5801f0..0eb6a67d2 100644
--- a/applications/solvers/solidMechanics/elasticOrthoSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticOrthoSolidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   elasticOrthoSolidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(elasticOrthoSolidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticPlasticNonLinTLSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticPlasticNonLinTLSolidFoam/CMakeLists.txt
index 97814f53c..8f89455f7 100644
--- a/applications/solvers/solidMechanics/elasticPlasticNonLinTLSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticPlasticNonLinTLSolidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   elasticPlasticNonLinTLSolidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(elasticPlasticNonLinTLSolidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/CMakeLists.txt
index 5321d82fd..68a3e2a87 100644
--- a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   elasticPlasticNonLinULSolidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(elasticPlasticNonLinULSolidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticPlasticSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticPlasticSolidFoam/CMakeLists.txt
index 224b01c77..208a9cb51 100644
--- a/applications/solvers/solidMechanics/elasticPlasticSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticPlasticSolidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   elasticPlasticSolidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(elasticPlasticSolidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticSolidFoam/CMakeLists.txt
index d4e4b2fa4..882e9cebb 100644
--- a/applications/solvers/solidMechanics/elasticSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticSolidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   elasticSolidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(elasticSolidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/elasticThermalSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/elasticThermalSolidFoam/CMakeLists.txt
index 06a8c4791..aefe0ae52 100644
--- a/applications/solvers/solidMechanics/elasticThermalSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/elasticThermalSolidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   elasticThermalSolidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(elasticThermalSolidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/CMakeLists.txt
index e7e115177..f879d1832 100644
--- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   icoFsiElasticNonLinULSolidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(icoFsiElasticNonLinULSolidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/stressFemFoam/CMakeLists.txt b/applications/solvers/solidMechanics/stressFemFoam/CMakeLists.txt
index f6bf7a898..acd231a46 100644
--- a/applications/solvers/solidMechanics/stressFemFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/stressFemFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   femStress/tractionTetPolyPatchVectorField.C
   stressFemFoam.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(stressFemFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/utilities/calculateCourantNumber/CMakeLists.txt b/applications/solvers/solidMechanics/utilities/calculateCourantNumber/CMakeLists.txt
index 3b74e3912..047af9267 100644
--- a/applications/solvers/solidMechanics/utilities/calculateCourantNumber/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/utilities/calculateCourantNumber/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   calculateCourantNumber.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(calculateCourantNumber
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/utilities/forceDisp/CMakeLists.txt b/applications/solvers/solidMechanics/utilities/forceDisp/CMakeLists.txt
index 065cd16c4..0ba39540f 100644
--- a/applications/solvers/solidMechanics/utilities/forceDisp/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/utilities/forceDisp/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   forceDisp.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(forceDisp
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/utilities/patchStressIntegrate/CMakeLists.txt b/applications/solvers/solidMechanics/utilities/patchStressIntegrate/CMakeLists.txt
index 87ea4d5e6..2897e58f9 100644
--- a/applications/solvers/solidMechanics/utilities/patchStressIntegrate/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/utilities/patchStressIntegrate/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   patchStressIntegrate.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(patchStressIntegrate
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/utilities/smoothMesh/CMakeLists.txt b/applications/solvers/solidMechanics/utilities/smoothMesh/CMakeLists.txt
index e6dc49d54..e8919fb6a 100644
--- a/applications/solvers/solidMechanics/utilities/smoothMesh/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/utilities/smoothMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   smoothMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(smoothMesh
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/utilities/surfaceTractions/CMakeLists.txt b/applications/solvers/solidMechanics/utilities/surfaceTractions/CMakeLists.txt
index cf2caa259..1c9d604db 100644
--- a/applications/solvers/solidMechanics/utilities/surfaceTractions/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/utilities/surfaceTractions/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceTractions.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceTractions
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/solidMechanics/viscoElasticSolidFoam/CMakeLists.txt b/applications/solvers/solidMechanics/viscoElasticSolidFoam/CMakeLists.txt
index ac3bb6afc..4d48176e4 100644
--- a/applications/solvers/solidMechanics/viscoElasticSolidFoam/CMakeLists.txt
+++ b/applications/solvers/solidMechanics/viscoElasticSolidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   viscoElasticSolidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(viscoElasticSolidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/surfaceTracking/bubbleInterTrackFoam/CMakeLists.txt b/applications/solvers/surfaceTracking/bubbleInterTrackFoam/CMakeLists.txt
index 17d89d5cf..aa714c49d 100644
--- a/applications/solvers/surfaceTracking/bubbleInterTrackFoam/CMakeLists.txt
+++ b/applications/solvers/surfaceTracking/bubbleInterTrackFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   bubbleInterTrackFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(bubbleInterTrackFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/surfaceTracking/freeSurface/CMakeLists.txt b/applications/solvers/surfaceTracking/freeSurface/CMakeLists.txt
index 8222a08da..2742c3fd0 100644
--- a/applications/solvers/surfaceTracking/freeSurface/CMakeLists.txt
+++ b/applications/solvers/surfaceTracking/freeSurface/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   freeSurface.C
   makeFreeSurfaceData.C
   freeSurfacePointDisplacement.C
@@ -38,7 +38,7 @@ list(APPEND sources
 )
 
 set(basicCorrectedFvPatchFields correctedFvPatchFields/basicCorrectedFvPatchFields)
-list(APPEND sources
+list(APPEND SOURCES
   ${basicCorrectedFvPatchFields}/fixedGradient/fixedGradientCorrectedFvPatchFields.C
   ${basicCorrectedFvPatchFields}/fixedValue/fixedValueCorrectedFvPatchFields.C
   ${basicCorrectedFvPatchFields}/zeroGradient/zeroGradientCorrectedFvPatchFields.C
@@ -47,8 +47,6 @@ list(APPEND sources
   functionObjects/sloshingHistory/sloshingHistory.C
 )
 
-add_foam_library(freeSurface SHARED ${sources})
+add_foam_library(freeSurface SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(freeSurface finiteVolume)
diff --git a/applications/solvers/surfaceTracking/interTrackFoam/CMakeLists.txt b/applications/solvers/surfaceTracking/interTrackFoam/CMakeLists.txt
index 2c3d33f4f..25ee05e89 100644
--- a/applications/solvers/surfaceTracking/interTrackFoam/CMakeLists.txt
+++ b/applications/solvers/surfaceTracking/interTrackFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   interTrackFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(interTrackFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/surfaceTracking/utilities/setFluidIndicator/CMakeLists.txt b/applications/solvers/surfaceTracking/utilities/setFluidIndicator/CMakeLists.txt
index ccf147727..41b6070cb 100644
--- a/applications/solvers/surfaceTracking/utilities/setFluidIndicator/CMakeLists.txt
+++ b/applications/solvers/surfaceTracking/utilities/setFluidIndicator/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   setFluidIndicator.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(setFluidIndicator
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/solvers/viscoelastic/viscoelasticFluidFoam/CMakeLists.txt b/applications/solvers/viscoelastic/viscoelasticFluidFoam/CMakeLists.txt
index 11eca757d..2dc7e5836 100644
--- a/applications/solvers/viscoelastic/viscoelasticFluidFoam/CMakeLists.txt
+++ b/applications/solvers/viscoelastic/viscoelasticFluidFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   viscoelasticFluidFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(viscoelasticFluidFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/errorEstimation/estimateScalarError/CMakeLists.txt b/applications/utilities/errorEstimation/estimateScalarError/CMakeLists.txt
index 0a64a2ed8..9f417ffda 100644
--- a/applications/utilities/errorEstimation/estimateScalarError/CMakeLists.txt
+++ b/applications/utilities/errorEstimation/estimateScalarError/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   estimateScalarError.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(estimateScalarError
   DEPENDS errorEstimation
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/errorEstimation/icoErrorEstimate/CMakeLists.txt b/applications/utilities/errorEstimation/icoErrorEstimate/CMakeLists.txt
index 4e69e08b9..ac622737c 100644
--- a/applications/utilities/errorEstimation/icoErrorEstimate/CMakeLists.txt
+++ b/applications/utilities/errorEstimation/icoErrorEstimate/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   icoErrorEstimate.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(icoErrorEstimate
   DEPENDS errorEstimation
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/errorEstimation/icoMomentError/CMakeLists.txt b/applications/utilities/errorEstimation/icoMomentError/CMakeLists.txt
index bbce8ebd2..ee9466113 100644
--- a/applications/utilities/errorEstimation/icoMomentError/CMakeLists.txt
+++ b/applications/utilities/errorEstimation/icoMomentError/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   icoMomentError.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(icoMomentError
   DEPENDS errorEstimation
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/errorEstimation/momentScalarError/CMakeLists.txt b/applications/utilities/errorEstimation/momentScalarError/CMakeLists.txt
index dd8bc4030..31d376584 100644
--- a/applications/utilities/errorEstimation/momentScalarError/CMakeLists.txt
+++ b/applications/utilities/errorEstimation/momentScalarError/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   momentScalarError.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(momentScalarError
   DEPENDS errorEstimation
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/errorEstimation/simpleFoamResidual/CMakeLists.txt b/applications/utilities/errorEstimation/simpleFoamResidual/CMakeLists.txt
index fcf6114a1..614840bf9 100644
--- a/applications/utilities/errorEstimation/simpleFoamResidual/CMakeLists.txt
+++ b/applications/utilities/errorEstimation/simpleFoamResidual/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   simpleFoamResidual.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(simpleFoamResidual
   DEPENDS errorEstimation incompressibleRASModels incompressibleLESModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/finiteArea/checkFaMesh/CMakeLists.txt b/applications/utilities/finiteArea/checkFaMesh/CMakeLists.txt
index dceda9543..0457caa82 100644
--- a/applications/utilities/finiteArea/checkFaMesh/CMakeLists.txt
+++ b/applications/utilities/finiteArea/checkFaMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   checkFaMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(checkFaMesh
   DEPENDS finiteVolume finiteArea
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/finiteArea/createFaMeshFromStl/CMakeLists.txt b/applications/utilities/finiteArea/createFaMeshFromStl/CMakeLists.txt
index 44ff0bd94..cd8f09fc0 100644
--- a/applications/utilities/finiteArea/createFaMeshFromStl/CMakeLists.txt
+++ b/applications/utilities/finiteArea/createFaMeshFromStl/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   createFaMeshFromStl.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(createFaMeshFromStl
   DEPENDS finiteArea meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/finiteArea/makeFaMesh/CMakeLists.txt b/applications/utilities/finiteArea/makeFaMesh/CMakeLists.txt
index 3df65bd7e..9181650be 100644
--- a/applications/utilities/finiteArea/makeFaMesh/CMakeLists.txt
+++ b/applications/utilities/finiteArea/makeFaMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   makeFaMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(makeFaMesh
   DEPENDS finiteVolume finiteArea
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/immersedBoundary/ibContinuityError/CMakeLists.txt b/applications/utilities/immersedBoundary/ibContinuityError/CMakeLists.txt
index 852727ae2..d7b18ddc7 100644
--- a/applications/utilities/immersedBoundary/ibContinuityError/CMakeLists.txt
+++ b/applications/utilities/immersedBoundary/ibContinuityError/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   ibContinuityError.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(ibContinuityError
   DEPENDS immersedBoundary postCalc
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/immersedBoundary/makeTriSurfaceMesh/CMakeLists.txt b/applications/utilities/immersedBoundary/makeTriSurfaceMesh/CMakeLists.txt
index 0460c2ee3..b0b6e3c5b 100644
--- a/applications/utilities/immersedBoundary/makeTriSurfaceMesh/CMakeLists.txt
+++ b/applications/utilities/immersedBoundary/makeTriSurfaceMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   makeTriSurfaceMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(makeTriSurfaceMesh
   DEPENDS immersedBoundary
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/immersedBoundary/refineImmersedBoundaryMesh/CMakeLists.txt b/applications/utilities/immersedBoundary/refineImmersedBoundaryMesh/CMakeLists.txt
index 54ed1658f..4b644f3f0 100644
--- a/applications/utilities/immersedBoundary/refineImmersedBoundaryMesh/CMakeLists.txt
+++ b/applications/utilities/immersedBoundary/refineImmersedBoundaryMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   refineImmersedBoundaryMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(refineImmersedBoundaryMesh
   DEPENDS immersedBoundary
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/immersedBoundary/surfaceInvertNormal/CMakeLists.txt b/applications/utilities/immersedBoundary/surfaceInvertNormal/CMakeLists.txt
index f40b44cd9..11549e598 100644
--- a/applications/utilities/immersedBoundary/surfaceInvertNormal/CMakeLists.txt
+++ b/applications/utilities/immersedBoundary/surfaceInvertNormal/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceInvertNormal.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceInvertNormal
   DEPENDS immersedBoundary
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/immersedBoundary/surfaceNormal/CMakeLists.txt b/applications/utilities/immersedBoundary/surfaceNormal/CMakeLists.txt
index e1895ccdd..164e062b8 100644
--- a/applications/utilities/immersedBoundary/surfaceNormal/CMakeLists.txt
+++ b/applications/utilities/immersedBoundary/surfaceNormal/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceNormal.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceNormal
   DEPENDS immersedBoundary
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/immersedBoundary/writeIbMasks/CMakeLists.txt b/applications/utilities/immersedBoundary/writeIbMasks/CMakeLists.txt
index b4da50579..26ffdd69f 100644
--- a/applications/utilities/immersedBoundary/writeIbMasks/CMakeLists.txt
+++ b/applications/utilities/immersedBoundary/writeIbMasks/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   writeIbMasks.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(writeIbMasks
   DEPENDS immersedBoundary
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/CMakeLists.txt b/applications/utilities/mesh/advanced/autoRefineMesh/CMakeLists.txt
index 8aac962c8..4d4535d72 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   autoRefineMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(autoRefineMesh
   DEPENDS finiteVolume dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/advanced/collapseEdges/CMakeLists.txt b/applications/utilities/mesh/advanced/collapseEdges/CMakeLists.txt
index 71668b24c..d20fffe97 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/collapseEdges/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   collapseEdges.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(collapseEdges
   DEPENDS finiteVolume dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/CMakeLists.txt b/applications/utilities/mesh/advanced/combinePatchFaces/CMakeLists.txt
index 8437a66f9..791fb8450 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   combinePatchFaces.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(combinePatchFaces
   DEPENDS finiteVolume dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/advanced/modifyMesh/CMakeLists.txt b/applications/utilities/mesh/advanced/modifyMesh/CMakeLists.txt
index 72cea8707..0980ad7f4 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/modifyMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   cellSplitter.C
   modifyMesh.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(modifyMesh
   DEPENDS finiteVolume dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/advanced/refineHexMesh/CMakeLists.txt b/applications/utilities/mesh/advanced/refineHexMesh/CMakeLists.txt
index e8d44a796..85325d811 100644
--- a/applications/utilities/mesh/advanced/refineHexMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/refineHexMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   refineHexMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(refineHexMesh
   DEPENDS finiteVolume dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/CMakeLists.txt b/applications/utilities/mesh/advanced/refineWallLayer/CMakeLists.txt
index 86d7a34e0..2e6a4e4a2 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/refineWallLayer/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   refineWallLayer.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(refineWallLayer
   DEPENDS finiteVolume dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/advanced/refinementLevel/CMakeLists.txt b/applications/utilities/mesh/advanced/refinementLevel/CMakeLists.txt
index 9caf3d21a..7074babef 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/refinementLevel/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   refinementLevel.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(refinementLevel
   DEPENDS finiteVolume dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/advanced/removeFaces/CMakeLists.txt b/applications/utilities/mesh/advanced/removeFaces/CMakeLists.txt
index e84f156cc..89a3d6f47 100644
--- a/applications/utilities/mesh/advanced/removeFaces/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/removeFaces/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   removeFaces.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(removeFaces
   DEPENDS finiteVolume dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/advanced/selectCells/CMakeLists.txt b/applications/utilities/mesh/advanced/selectCells/CMakeLists.txt
index eda2e26bd..fda700b4d 100644
--- a/applications/utilities/mesh/advanced/selectCells/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/selectCells/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   edgeStats.C
   selectCells.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(selectCells
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/advanced/splitCells/CMakeLists.txt b/applications/utilities/mesh/advanced/splitCells/CMakeLists.txt
index 5ecb4b776..a775e76f2 100644
--- a/applications/utilities/mesh/advanced/splitCells/CMakeLists.txt
+++ b/applications/utilities/mesh/advanced/splitCells/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   splitCells.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(splitCells
   DEPENDS finiteVolume dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/CMakeLists.txt
index 0e8d1b7a0..7ac61fc6f 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   ccm26ToFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(ccm26ToFoam
   DEPENDS finiteVolume meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/ansysToFoam/CMakeLists.txt
index 513184b38..a54367317 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/ansysToFoam/CMakeLists.txt
@@ -32,7 +32,7 @@
 
 FLEX_TARGET(ansysToFoam ansysToFoam.L
   ${CMAKE_CURRENT_BINARY_DIR}/ansysToFoam.C COMPILE_FLAGS "-+")
-list(APPEND sources ${FLEX_ansysToFoam_OUTPUTS})
+list(APPEND SOURCES ${FLEX_ansysToFoam_OUTPUTS})
 
 # Set minimal environment for external compilation
 if(NOT FOAM_FOUND)
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(ansysToFoam
   DEPENDS foam
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/cfx4ToFoam/CMakeLists.txt
index 8acef9951..9e4c82853 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   hexBlock.C
   cfx4ToFoam.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(cfx4ToFoam
   DEPENDS foam
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToElmer/CMakeLists.txt b/applications/utilities/mesh/conversion/fluent3DMeshToElmer/CMakeLists.txt
index d4e795840..2e9beee07 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToElmer/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToElmer/CMakeLists.txt
@@ -32,7 +32,7 @@
 
 FLEX_TARGET(fluent3DMeshToElmer fluent3DMeshToElmer.L
   ${CMAKE_CURRENT_BINARY_DIR}/fluent3DMeshToElmer.C COMPILE_FLAGS "-+")
-list(APPEND sources ${FLEX_fluent3DMeshToElmer_OUTPUTS})
+list(APPEND SOURCES ${FLEX_fluent3DMeshToElmer_OUTPUTS})
 
 # Set minimal environment for external compilation
 if(NOT FOAM_FOUND)
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(fluent3DMeshToElmer
   DEPENDS dynamicMesh conversion
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/CMakeLists.txt
index 6f9b49b09..21392dfe0 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/CMakeLists.txt
@@ -32,7 +32,7 @@
 
 FLEX_TARGET(fluent3DMeshToFoam fluent3DMeshToFoam.L
   ${CMAKE_CURRENT_BINARY_DIR}/fluent3DMeshToFoam.C COMPILE_FLAGS "-+")
-list(APPEND sources ${FLEX_fluent3DMeshToFoam_OUTPUTS})
+list(APPEND SOURCES ${FLEX_fluent3DMeshToFoam_OUTPUTS})
 
 # Set minimal environment for external compilation
 if(NOT FOAM_FOUND)
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(fluent3DMeshToFoam
   DEPENDS dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/fluentMeshToFoam/CMakeLists.txt
index 4fa257d2a..a8e831a5e 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/CMakeLists.txt
@@ -30,14 +30,14 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   extrudedTriangleCellShape.C
   extrudedQuadCellShape.C
   create3DCellShape.C
 )
 FLEX_TARGET(fluentMeshToFoam fluentMeshToFoam.L
   ${CMAKE_CURRENT_BINARY_DIR}/fluentMeshToFoam.C COMPILE_FLAGS "-+")
-list(APPEND sources ${FLEX_fluentMeshToFoam_OUTPUTS})
+list(APPEND SOURCES ${FLEX_fluentMeshToFoam_OUTPUTS})
 
 # Set minimal environment for external compilation
 if(NOT FOAM_FOUND)
@@ -47,5 +47,9 @@ endif()
 
 add_foam_executable(fluentMeshToFoam
   DEPENDS dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
+)
+target_include_directories(fluentMeshToFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+#  $<INSTALL_INTERFACE:include/mylib>
 )
diff --git a/applications/utilities/mesh/conversion/foamMeshToAbaqus/CMakeLists.txt b/applications/utilities/mesh/conversion/foamMeshToAbaqus/CMakeLists.txt
index b044a1de7..bf76b1704 100644
--- a/applications/utilities/mesh/conversion/foamMeshToAbaqus/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/foamMeshToAbaqus/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   foamMeshToAbaqus.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(foamMeshToAbaqus
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/foamMeshToElmer/CMakeLists.txt b/applications/utilities/mesh/conversion/foamMeshToElmer/CMakeLists.txt
index 85393bd4f..f21925be6 100644
--- a/applications/utilities/mesh/conversion/foamMeshToElmer/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/foamMeshToElmer/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   foamMeshToElmer.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(foamMeshToElmer
   DEPENDS conversion
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/CMakeLists.txt b/applications/utilities/mesh/conversion/foamMeshToFluent/CMakeLists.txt
index ab3229c5a..f9f273923 100644
--- a/applications/utilities/mesh/conversion/foamMeshToFluent/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/foamMeshToFluent/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   fluentFvMesh.C
   foamMeshToFluent.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(foamMeshToFluent
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/CMakeLists.txt b/applications/utilities/mesh/conversion/foamToStarMesh/CMakeLists.txt
index 9a2fb3dc7..ba13835bc 100644
--- a/applications/utilities/mesh/conversion/foamToStarMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/foamToStarMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   foamToStarMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(foamToStarMesh
   DEPENDS conversion
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/gambitToFoam/CMakeLists.txt
index 1a8703d88..cd9e835ae 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/gambitToFoam/CMakeLists.txt
@@ -32,7 +32,7 @@
 
 FLEX_TARGET(gambitToFoam gambitToFoam.L
   ${CMAKE_CURRENT_BINARY_DIR}/gambitToFoam.C COMPILE_FLAGS "-+")
-list(APPEND sources ${FLEX_gambitToFoam_OUTPUTS})
+list(APPEND SOURCES ${FLEX_gambitToFoam_OUTPUTS})
 
 # Set minimal environment for external compilation
 if(NOT FOAM_FOUND)
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(gambitToFoam
   DEPENDS foam
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/gmshToFoam/CMakeLists.txt
index 5338a8503..35b3a701f 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/gmshToFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   gmshToFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(gmshToFoam
   DEPENDS dynamicMesh meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/ideasUnvToFoam/CMakeLists.txt
index d99117286..bb13541e8 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   ideasUnvToFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(ideasUnvToFoam
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/kivaToFoam/CMakeLists.txt
index 9d437c99b..f9fc4bd38 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/kivaToFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   kivaToFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(kivaToFoam
   DEPENDS foam
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/mshToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/mshToFoam/CMakeLists.txt
index d84ba0472..90fa22215 100644
--- a/applications/utilities/mesh/conversion/mshToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/mshToFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   mshToFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(mshToFoam
   DEPENDS foam
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/netgenNeutralToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/netgenNeutralToFoam/CMakeLists.txt
index 5ed98fb77..24a7b942e 100644
--- a/applications/utilities/mesh/conversion/netgenNeutralToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/netgenNeutralToFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   netgenNeutralToFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(netgenNeutralToFoam
   DEPENDS foam
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/plot3dToFoam/CMakeLists.txt
index c604ad3a0..2a06d9521 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   hexBlock.C
   plot3dToFoam.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(plot3dToFoam
   DEPENDS foam
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/CMakeLists.txt b/applications/utilities/mesh/conversion/polyDualMesh/CMakeLists.txt
index d493223b2..b2a983906 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/polyDualMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   meshDualiser.C
   polyDualMeshApp.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(polyDualMesh
   DEPENDS finiteVolume dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/sammToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/sammToFoam/CMakeLists.txt
index 2b5df5c26..fe4fd7eeb 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/sammToFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   sammMesh.C
   fillSammCellShapeTable.C
   fillSammAddressingTable.C
@@ -56,5 +56,5 @@ endif()
 
 add_foam_executable(sammToFoam
   DEPENDS foam
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/star4ToFoam/cellZoneToCellTableId/CMakeLists.txt b/applications/utilities/mesh/conversion/star4ToFoam/cellZoneToCellTableId/CMakeLists.txt
index 5238976db..0b51cdcd2 100644
--- a/applications/utilities/mesh/conversion/star4ToFoam/cellZoneToCellTableId/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/star4ToFoam/cellZoneToCellTableId/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   cellZoneToCellTableId.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(cellZoneToCellTableId
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/star4ToFoam/foamMeshToStar/CMakeLists.txt b/applications/utilities/mesh/conversion/star4ToFoam/foamMeshToStar/CMakeLists.txt
index 30c0bf731..f4ef49e56 100644
--- a/applications/utilities/mesh/conversion/star4ToFoam/foamMeshToStar/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/star4ToFoam/foamMeshToStar/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   foamMeshToStar.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(foamMeshToStar
   DEPENDS conversion meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam/CMakeLists.txt
index f30a4c39d..288b8ab80 100644
--- a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   meshReader.C
   meshReaderAux.C
   starMeshReader.C
@@ -48,5 +48,5 @@ endif()
 
 add_foam_executable(star4ToFoam
   DEPENDS finiteVolume meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/starToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/starToFoam/CMakeLists.txt
index 4a9bf082f..8109d479d 100644
--- a/applications/utilities/mesh/conversion/starToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/starToFoam/CMakeLists.txt
@@ -30,13 +30,13 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   coupledFacePair.C
   starMesh.C
   readPoints.C
 )
 # readSeparatedPoints.C
-list(APPEND sources
+list(APPEND SOURCES
   readCells.C
   readBoundary.C
   fixCollapsedEdges.C
@@ -60,5 +60,5 @@ endif()
 
 add_foam_executable(starToFoam
   DEPENDS foam
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/CMakeLists.txt b/applications/utilities/mesh/conversion/tetgenToFoam/CMakeLists.txt
index dfe013097..1242a1d41 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   tetgenToFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(tetgenToFoam
   DEPENDS foam
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/conversion/writeMeshObj/CMakeLists.txt b/applications/utilities/mesh/conversion/writeMeshObj/CMakeLists.txt
index 04aba7cfb..5213919ef 100644
--- a/applications/utilities/mesh/conversion/writeMeshObj/CMakeLists.txt
+++ b/applications/utilities/mesh/conversion/writeMeshObj/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   writeMeshObj.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(writeMeshObj
   DEPENDS foam meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/blockMesh/CMakeLists.txt b/applications/utilities/mesh/generation/blockMesh/CMakeLists.txt
index de3485d86..23e6399e4 100644
--- a/applications/utilities/mesh/generation/blockMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/blockMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   blockMeshApp.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(blockMesh
   DEPENDS blockMeshLib
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/CMakeLists.txt
index e5d7f2b59..fed9c58b8 100644
--- a/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   FLMAToSurface.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(FLMAToSurface
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/FMSToSurface/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/FMSToSurface/CMakeLists.txt
index fe491c446..db76a0974 100644
--- a/applications/utilities/mesh/generation/cfMesh/FMSToSurface/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/FMSToSurface/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   FMSToSurface.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(FMSToSurface
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/FMSToVTK/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/FMSToVTK/CMakeLists.txt
index ce826120c..1e2d6ad7a 100644
--- a/applications/utilities/mesh/generation/cfMesh/FMSToVTK/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/FMSToVTK/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   FMSToVTK.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(FMSToVTK
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/CMakeLists.txt
index 898041924..c7f2d2481 100644
--- a/applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   cartesian2DMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(cartesian2DMesh
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/cartesianMesh/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/cartesianMesh/CMakeLists.txt
index 5a8e068e6..950be7c56 100644
--- a/applications/utilities/mesh/generation/cfMesh/cartesianMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/cartesianMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   cartesianMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(cartesianMesh
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/checkSurfaceMesh/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/checkSurfaceMesh/CMakeLists.txt
index a22489408..8d31266a4 100644
--- a/applications/utilities/mesh/generation/cfMesh/checkSurfaceMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/checkSurfaceMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   checkSurfaceMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(checkSurfaceMesh
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/copySurfaceParts/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/copySurfaceParts/CMakeLists.txt
index 680055aa2..cbb114212 100644
--- a/applications/utilities/mesh/generation/cfMesh/copySurfaceParts/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/copySurfaceParts/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   copySurfaceParts.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(copySurfaceParts
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/extrudeEdgesInto2DSurface/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/extrudeEdgesInto2DSurface/CMakeLists.txt
index 7e73ea254..5bf6c038a 100644
--- a/applications/utilities/mesh/generation/cfMesh/extrudeEdgesInto2DSurface/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/extrudeEdgesInto2DSurface/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   extrudeEdgesInto2DSurface.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(extrudeEdgesInto2DSurface
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/generateBoundaryLayers/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/generateBoundaryLayers/CMakeLists.txt
index f2eb31930..3bcf8c99d 100644
--- a/applications/utilities/mesh/generation/cfMesh/generateBoundaryLayers/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/generateBoundaryLayers/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   generateBoundaryLayers.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(generateBoundaryLayers
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/importSurfaceAsSubset/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/importSurfaceAsSubset/CMakeLists.txt
index 2ec0797a5..a20dec78a 100644
--- a/applications/utilities/mesh/generation/cfMesh/importSurfaceAsSubset/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/importSurfaceAsSubset/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   importSurfaceAsSubset.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(importSurfaceAsSubset
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/improveMeshQuality/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/improveMeshQuality/CMakeLists.txt
index ffe2081d9..09e7aa528 100644
--- a/applications/utilities/mesh/generation/cfMesh/improveMeshQuality/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/improveMeshQuality/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   improveMeshQuality.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(improveMeshQuality
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/improveSymmetryPlanes/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/improveSymmetryPlanes/CMakeLists.txt
index e44ef0c9c..cafb83308 100644
--- a/applications/utilities/mesh/generation/cfMesh/improveSymmetryPlanes/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/improveSymmetryPlanes/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   improveSymmetryPlanes.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(improveSymmetryPlanes
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/CMakeLists.txt
index 9c92e3700..6942afaf0 100644
--- a/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   mergeSurfacePatches.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(mergeSurfacePatches
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/meshToFPMA/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/meshToFPMA/CMakeLists.txt
index a3948a13f..3669fd594 100644
--- a/applications/utilities/mesh/generation/cfMesh/meshToFPMA/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/meshToFPMA/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   meshToFPMA.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(meshToFPMA
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/pMesh/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/pMesh/CMakeLists.txt
index 2a0296f4a..7b65e10f9 100644
--- a/applications/utilities/mesh/generation/cfMesh/pMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/pMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   pMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(pMesh
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/patchesToSubsets/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/patchesToSubsets/CMakeLists.txt
index 3e95136c3..84df2ad5f 100644
--- a/applications/utilities/mesh/generation/cfMesh/patchesToSubsets/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/patchesToSubsets/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   patchesToSubsets.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(patchesToSubsets
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/preparePar/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/preparePar/CMakeLists.txt
index 5d47c9cef..8f5fff944 100644
--- a/applications/utilities/mesh/generation/cfMesh/preparePar/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/preparePar/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   preparePar.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(preparePar
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/CMakeLists.txt
index 87c348f18..00048ed8c 100644
--- a/applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   removeSurfaceFacets.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(removeSurfaceFacets
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/scaleMesh/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/scaleMesh/CMakeLists.txt
index 1e44dfe58..c8eccc6d1 100644
--- a/applications/utilities/mesh/generation/cfMesh/scaleMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/scaleMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   scaleMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(scaleMesh
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/scaleSurfaceMesh/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/scaleSurfaceMesh/CMakeLists.txt
index f34b5fc5b..3f70980c7 100644
--- a/applications/utilities/mesh/generation/cfMesh/scaleSurfaceMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/scaleSurfaceMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   scaleSurfaceMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(scaleSurfaceMesh
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/subsetToPatch/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/subsetToPatch/CMakeLists.txt
index 2832e2ab6..305e9c2fb 100644
--- a/applications/utilities/mesh/generation/cfMesh/subsetToPatch/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/subsetToPatch/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   subsetToPatch.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(subsetToPatch
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/surfaceFeatureEdges/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/surfaceFeatureEdges/CMakeLists.txt
index 755a54f3a..a78345802 100644
--- a/applications/utilities/mesh/generation/cfMesh/surfaceFeatureEdges/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/surfaceFeatureEdges/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceFeatureEdges.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceFeatureEdges
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/surfaceGenerateBoundingBox/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/surfaceGenerateBoundingBox/CMakeLists.txt
index 483713654..dcc4e8419 100644
--- a/applications/utilities/mesh/generation/cfMesh/surfaceGenerateBoundingBox/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/surfaceGenerateBoundingBox/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceGenerateBoundingBox.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceGenerateBoundingBox
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/surfaceToFMS/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/surfaceToFMS/CMakeLists.txt
index 126fae5b1..dbc444cc7 100644
--- a/applications/utilities/mesh/generation/cfMesh/surfaceToFMS/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/surfaceToFMS/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceToFMS.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceToFMS
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/cfMesh/tetMesh/CMakeLists.txt b/applications/utilities/mesh/generation/cfMesh/tetMesh/CMakeLists.txt
index 2f4ec16d2..b7ecb2c09 100644
--- a/applications/utilities/mesh/generation/cfMesh/tetMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/cfMesh/tetMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   tetMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(tetMesh
   DEPENDS cfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/CMakeLists.txt b/applications/utilities/mesh/generation/extrude2DMesh/CMakeLists.txt
index 4ecf073eb..19e05f091 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/extrude2DMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   extrude2DMesh.C
   doExtrude2DMesh.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(extrude2DMesh
   DEPENDS dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/generation/extrudeMesh/CMakeLists.txt b/applications/utilities/mesh/generation/extrudeMesh/CMakeLists.txt
index 1a0c0ff80..3468946b9 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/extrudeMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   extrudeMesh.C
 )
 
@@ -42,10 +42,10 @@ endif()
 
 add_foam_executable(extrudeMesh
   DEPENDS extrudeModel
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
 
 target_include_directories(extrudeMesh PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/extrudedMesh>
-  $<INSTALL_INTERFACE:include/mylib>
+#  $<INSTALL_INTERFACE:include/mylib>
 )
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/CMakeLists.txt b/applications/utilities/mesh/generation/snappyHexMesh/CMakeLists.txt
index 232487d28..a125139ce 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/generation/snappyHexMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   snappyHexMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(snappyHexMesh
   DEPENDS dynamicFvMesh autoMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/attachMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/attachMesh/CMakeLists.txt
index 79208e8c9..039deb084 100644
--- a/applications/utilities/mesh/manipulation/attachMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/attachMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   attachPolyTopoChanger.C
   attachMesh.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(attachMesh
   DEPENDS dynamicMesh meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/autoPatch/CMakeLists.txt b/applications/utilities/mesh/manipulation/autoPatch/CMakeLists.txt
index 36d5a2f95..447ef96b5 100644
--- a/applications/utilities/mesh/manipulation/autoPatch/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/autoPatch/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   autoPatch.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(autoPatch
   DEPENDS dynamicMesh meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/cellSet/CMakeLists.txt b/applications/utilities/mesh/manipulation/cellSet/CMakeLists.txt
index 91349290e..f7325792a 100644
--- a/applications/utilities/mesh/manipulation/cellSet/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/cellSet/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   cellSet.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(cellSet
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/checkMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/checkMesh/CMakeLists.txt
index 9ead34e48..5c3e85d6b 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/checkMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   printMeshStats.C
   checkTopology.C
   checkGeometry.C
@@ -45,5 +45,5 @@ endif()
 
 add_foam_executable(checkMesh
   DEPENDS finiteVolume meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/checkSurfaceCurvature/CMakeLists.txt b/applications/utilities/mesh/manipulation/checkSurfaceCurvature/CMakeLists.txt
index 33ae64a54..7642a4cb3 100644
--- a/applications/utilities/mesh/manipulation/checkSurfaceCurvature/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/checkSurfaceCurvature/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   checkSurfaceCurvature.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(checkSurfaceCurvature
   DEPENDS finiteVolume finiteArea
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/createBaffles/CMakeLists.txt b/applications/utilities/mesh/manipulation/createBaffles/CMakeLists.txt
index 888e0e53f..ba0764e88 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/createBaffles/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   createBaffles.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(createBaffles
   DEPENDS finiteVolume dynamicMesh meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/createPatch/CMakeLists.txt b/applications/utilities/mesh/manipulation/createPatch/CMakeLists.txt
index 33d87aa0d..52607f66b 100644
--- a/applications/utilities/mesh/manipulation/createPatch/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/createPatch/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   createPatch.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(createPatch
   DEPENDS dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/deformedGeom/CMakeLists.txt b/applications/utilities/mesh/manipulation/deformedGeom/CMakeLists.txt
index 6fe3ce8fe..dbd025909 100644
--- a/applications/utilities/mesh/manipulation/deformedGeom/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/deformedGeom/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   deformedGeom.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(deformedGeom
   DEPENDS finiteVolume meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/deformedTetFemGeom/CMakeLists.txt b/applications/utilities/mesh/manipulation/deformedTetFemGeom/CMakeLists.txt
index f7cbdd197..010ffda1e 100644
--- a/applications/utilities/mesh/manipulation/deformedTetFemGeom/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/deformedTetFemGeom/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   deformedTetFemGeom.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(deformedTetFemGeom
   DEPENDS tetFiniteElement
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/faceSet/CMakeLists.txt b/applications/utilities/mesh/manipulation/faceSet/CMakeLists.txt
index f392774d4..8c77bb1ba 100644
--- a/applications/utilities/mesh/manipulation/faceSet/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/faceSet/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   faceSet.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(faceSet
   DEPENDS finiteVolume meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/flattenMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/flattenMesh/CMakeLists.txt
index 4763cc21e..f73d39789 100644
--- a/applications/utilities/mesh/manipulation/flattenMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/flattenMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   flattenMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(flattenMesh
   DEPENDS finiteVolume meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/insideCells/CMakeLists.txt b/applications/utilities/mesh/manipulation/insideCells/CMakeLists.txt
index 808b93ce3..babc14e71 100644
--- a/applications/utilities/mesh/manipulation/insideCells/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/insideCells/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   insideCells.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(insideCells
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/CMakeLists.txt b/applications/utilities/mesh/manipulation/mergeMeshes/CMakeLists.txt
index 8a067e1a0..4ce5f7071 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   mergePolyMesh.C
   mergeMeshes.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(mergeMeshes
   DEPENDS dynamicMesh meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/CMakeLists.txt b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/CMakeLists.txt
index 3c237f928..9bfbc33bc 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   mergeOrSplitBaffles.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(mergeOrSplitBaffles
   DEPENDS finiteVolume dynamicMesh meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/mirrorMesh/CMakeLists.txt
index 1ed1963c3..d95e2050f 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   mirrorFvMesh.C
   mirrorMesh.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(mirrorMesh
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/moveDyMEngineMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/moveDyMEngineMesh/CMakeLists.txt
index 7715231dc..81f50a433 100644
--- a/applications/utilities/mesh/manipulation/moveDyMEngineMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/moveDyMEngineMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   moveDyMEngineMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(moveDyMEngineMesh
   DEPENDS engine
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/moveDynamicMesh/CMakeLists.txt
index 5a1cf9c46..53aa0f67b 100644
--- a/applications/utilities/mesh/manipulation/moveDynamicMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   moveDynamicMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(moveDynamicMesh
   DEPENDS engine
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/moveEngineMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/moveEngineMesh/CMakeLists.txt
index 8948a2f30..51b8ca32b 100644
--- a/applications/utilities/mesh/manipulation/moveEngineMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/moveEngineMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   moveEngineMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(moveEngineMesh
   DEPENDS engine
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/moveMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/moveMesh/CMakeLists.txt
index 36590ce62..142e7e990 100644
--- a/applications/utilities/mesh/manipulation/moveMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/moveMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   moveMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(moveMesh
   DEPENDS finiteVolume dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/objToVTK/CMakeLists.txt b/applications/utilities/mesh/manipulation/objToVTK/CMakeLists.txt
index 1524095d5..b65cc09f8 100644
--- a/applications/utilities/mesh/manipulation/objToVTK/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/objToVTK/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   objToVTK.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(objToVTK
   DEPENDS finiteVolume meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/pointSet/CMakeLists.txt b/applications/utilities/mesh/manipulation/pointSet/CMakeLists.txt
index 2c058dd55..0d343ba59 100644
--- a/applications/utilities/mesh/manipulation/pointSet/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/pointSet/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   pointSet.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(pointSet
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/refineMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/refineMesh/CMakeLists.txt
index 00033928f..e94ded0d2 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/refineMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   refineMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(refineMesh
   DEPENDS dynamicMesh meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/regionCellSets/CMakeLists.txt b/applications/utilities/mesh/manipulation/regionCellSets/CMakeLists.txt
index 3a5c4604a..5b1538c8d 100644
--- a/applications/utilities/mesh/manipulation/regionCellSets/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/regionCellSets/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   regionCellSets.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(regionCellSets
   DEPENDS finiteVolume meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/renumberMesh/CMakeLists.txt
index 66203bdfe..a18141c34 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/renumberMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   renumberMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(renumberMesh
   DEPENDS finiteVolume dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/rotateMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/rotateMesh/CMakeLists.txt
index 3961854f3..22e27534d 100644
--- a/applications/utilities/mesh/manipulation/rotateMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/rotateMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   rotateMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(rotateMesh
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/setSet/CMakeLists.txt b/applications/utilities/mesh/manipulation/setSet/CMakeLists.txt
index 507e12671..2f7f25024 100644
--- a/applications/utilities/mesh/manipulation/setSet/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/setSet/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   writePointSet.C
   writeFuns.C
   writePatch.C
@@ -45,5 +45,5 @@ endif()
 
 add_foam_executable(setSet
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/setsToZones/CMakeLists.txt b/applications/utilities/mesh/manipulation/setsToZones/CMakeLists.txt
index 4fa1eb1be..aeebb6c70 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/setsToZones/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   setsToZones.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(setsToZones
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/splitMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/splitMesh/CMakeLists.txt
index ecdeb6286..53b731afb 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/splitMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   regionSide.C
   splitMesh.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(splitMesh
   DEPENDS dynamicMesh meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/CMakeLists.txt b/applications/utilities/mesh/manipulation/splitMeshRegions/CMakeLists.txt
index 9b57ee8f4..ec1a54fef 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   splitMeshRegions.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(splitMeshRegions
   DEPENDS finiteVolume dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/stitchMesh/CMakeLists.txt
index d895bce7f..cf180c197 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/stitchMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   stitchMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(stitchMesh
   DEPENDS finiteVolume dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/subsetMesh/CMakeLists.txt
index 03f9d6309..42588de44 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/subsetMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   subsetMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(subsetMesh
   DEPENDS finiteVolume meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/tetDecomposition/CMakeLists.txt b/applications/utilities/mesh/manipulation/tetDecomposition/CMakeLists.txt
index 056e8ef1f..c03e4180c 100644
--- a/applications/utilities/mesh/manipulation/tetDecomposition/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/tetDecomposition/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   tetDecomposition.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(tetDecomposition
   DEPENDS finiteVolume tetFiniteElement
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/transformPoints/CMakeLists.txt b/applications/utilities/mesh/manipulation/transformPoints/CMakeLists.txt
index f25775e83..83aa04199 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/transformPoints/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   transformPoints.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(transformPoints
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/mesh/manipulation/zipUpMesh/CMakeLists.txt b/applications/utilities/mesh/manipulation/zipUpMesh/CMakeLists.txt
index 47ec2621d..c9304e7c9 100644
--- a/applications/utilities/mesh/manipulation/zipUpMesh/CMakeLists.txt
+++ b/applications/utilities/mesh/manipulation/zipUpMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   zipUpMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(zipUpMesh
   DEPENDS finiteVolume meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/miscellaneous/autoDerivative/testFad/CMakeLists.txt b/applications/utilities/miscellaneous/autoDerivative/testFad/CMakeLists.txt
index 60196aa41..190f55956 100644
--- a/applications/utilities/miscellaneous/autoDerivative/testFad/CMakeLists.txt
+++ b/applications/utilities/miscellaneous/autoDerivative/testFad/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   testFad.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(testFad
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/miscellaneous/autoDerivative/testFadField/CMakeLists.txt b/applications/utilities/miscellaneous/autoDerivative/testFadField/CMakeLists.txt
index 9d7a21c0b..311e4ec77 100644
--- a/applications/utilities/miscellaneous/autoDerivative/testFadField/CMakeLists.txt
+++ b/applications/utilities/miscellaneous/autoDerivative/testFadField/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   testFadField.C
   fadOneFields.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(testFadField
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/miscellaneous/expandDictionary/CMakeLists.txt b/applications/utilities/miscellaneous/expandDictionary/CMakeLists.txt
index 85d311b65..3e50205ee 100644
--- a/applications/utilities/miscellaneous/expandDictionary/CMakeLists.txt
+++ b/applications/utilities/miscellaneous/expandDictionary/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   expandDictionary.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(expandDictionary
   DEPENDS foam
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/miscellaneous/findRoot/CMakeLists.txt b/applications/utilities/miscellaneous/findRoot/CMakeLists.txt
index 459579f86..67f8995aa 100644
--- a/applications/utilities/miscellaneous/findRoot/CMakeLists.txt
+++ b/applications/utilities/miscellaneous/findRoot/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   findRoot.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(findRoot
   DEPENDS finiteVolume ODE
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/miscellaneous/foamFormatConvert/CMakeLists.txt b/applications/utilities/miscellaneous/foamFormatConvert/CMakeLists.txt
index 400797bd2..32a95fffd 100644
--- a/applications/utilities/miscellaneous/foamFormatConvert/CMakeLists.txt
+++ b/applications/utilities/miscellaneous/foamFormatConvert/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   foamFormatConvert.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(foamFormatConvert
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/miscellaneous/foamInfoExec/CMakeLists.txt b/applications/utilities/miscellaneous/foamInfoExec/CMakeLists.txt
index 7808507ac..99df24605 100644
--- a/applications/utilities/miscellaneous/foamInfoExec/CMakeLists.txt
+++ b/applications/utilities/miscellaneous/foamInfoExec/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   foamInfoExec.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(foamInfoExec
   DEPENDS foam
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/miscellaneous/patchSummary/CMakeLists.txt b/applications/utilities/miscellaneous/patchSummary/CMakeLists.txt
index fd7664edd..3744c2caa 100644
--- a/applications/utilities/miscellaneous/patchSummary/CMakeLists.txt
+++ b/applications/utilities/miscellaneous/patchSummary/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   patchSummary.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(patchSummary
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/parallelProcessing/decomposePar/CMakeLists.txt b/applications/utilities/parallelProcessing/decomposePar/CMakeLists.txt
index 73055d26c..0f78fb247 100644
--- a/applications/utilities/parallelProcessing/decomposePar/CMakeLists.txt
+++ b/applications/utilities/parallelProcessing/decomposePar/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   decomposeMesh.C
   decomposePar.C
   domainDecomposition.C
@@ -51,5 +51,5 @@ endif()
 
 add_foam_executable(decomposePar
   DEPENDS finiteVolume finiteArea tetFiniteElement
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/parallelProcessing/decomposeSets/CMakeLists.txt b/applications/utilities/parallelProcessing/decomposeSets/CMakeLists.txt
index adbf31ac2..f4f65f08f 100644
--- a/applications/utilities/parallelProcessing/decomposeSets/CMakeLists.txt
+++ b/applications/utilities/parallelProcessing/decomposeSets/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   processorMeshes.C
   decomposeSets.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(decomposeSets
   DEPENDS finiteVolume meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/parallelProcessing/reconstructPar/CMakeLists.txt b/applications/utilities/parallelProcessing/reconstructPar/CMakeLists.txt
index 929057cc1..778cf51a6 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/CMakeLists.txt
+++ b/applications/utilities/parallelProcessing/reconstructPar/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   processorMeshes.C
   processorFaMeshes.C
   fvFieldReconstructor.C
@@ -49,5 +49,5 @@ endif()
 
 add_foam_executable(reconstructPar
   DEPENDS finiteVolume finiteArea tetFiniteElement
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/CMakeLists.txt b/applications/utilities/parallelProcessing/reconstructParMesh/CMakeLists.txt
index 58de8846e..81fe1e7c3 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/CMakeLists.txt
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   processorMeshesReconstructor.C
   processorMeshesRebuild.C
   processorFaMeshes.C
@@ -50,5 +50,5 @@ endif()
 
 add_foam_executable(reconstructParMesh
   DEPENDS finiteVolume finiteArea tetFiniteElement
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/CMakeLists.txt b/applications/utilities/parallelProcessing/redistributeMeshPar/CMakeLists.txt
index a84c21a9e..a71531bae 100644
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/CMakeLists.txt
+++ b/applications/utilities/parallelProcessing/redistributeMeshPar/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   redistributeMeshPar.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(redistributeMeshPar
   DEPENDS dynamicFvMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/POD/scalarSnapshots/CMakeLists.txt b/applications/utilities/postProcessing/POD/scalarSnapshots/CMakeLists.txt
index 2c4307602..32f0c664c 100644
--- a/applications/utilities/postProcessing/POD/scalarSnapshots/CMakeLists.txt
+++ b/applications/utilities/postProcessing/POD/scalarSnapshots/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   scalarSnapshots.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(scalarSnapshots
   DEPENDS POD
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/POD/vectorSnapshots/CMakeLists.txt b/applications/utilities/postProcessing/POD/vectorSnapshots/CMakeLists.txt
index 18411ddcc..e51ad2447 100644
--- a/applications/utilities/postProcessing/POD/vectorSnapshots/CMakeLists.txt
+++ b/applications/utilities/postProcessing/POD/vectorSnapshots/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   vectorSnapshots.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(vectorSnapshots
   DEPENDS POD
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/CMakeLists.txt
index 092f502ac..79e1ab65b 100644
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   writeFluentScalarField.C
   writeFluentVectorField.C
   foamDataToFluent.C
@@ -44,5 +44,5 @@ endif()
 
 add_foam_executable(foamDataToFluent
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/foamToEnsight/CMakeLists.txt
index 24590d63a..5c1387583 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   itoa.C
   ensightMesh.C
   ensightParticlePositions.C
@@ -46,5 +46,5 @@ endif()
 
 add_foam_executable(foamToEnsight
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/CMakeLists.txt
index 0d3b24172..4959d0dc2 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   foamToEnsightParts.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(foamToEnsightParts
   DEPENDS finiteVolume conversion
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/CMakeLists.txt
index bee379dc9..64cec83c8 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   foamToFieldview9.C
   fieldviewTopology.C
   write_binary_uns.c
@@ -46,5 +46,5 @@ endif()
 
 add_foam_executable(foamToFieldview9
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/foamToGMV/CMakeLists.txt
index c99f9faa6..6127cc5b5 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   foamToGMV.C
   itoa.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(foamToGMV
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/tecsrc/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/tecsrc/CMakeLists.txt
index 0efb25cc8..2973e92e0 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/tecsrc/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/tecsrc/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   alloc.cpp
   arrlist.cpp
   auxdata.cpp
@@ -51,8 +51,6 @@ list(APPEND sources
   TranslatedString.cpp
 )
 
-add_foam_library(tecio SHARED ${sources})
+add_foam_library(tecio SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(tecio finiteVolume)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/foamToVTK/CMakeLists.txt
index bb894dc61..565b84839 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   foamToVTK.C
   internalWriter.C
   lagrangianWriter.C
@@ -53,5 +53,5 @@ endif()
 
 add_foam_executable(foamToVTK
   DEPENDS finiteVolume finiteArea
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/dataConversion/smapToFoam/CMakeLists.txt b/applications/utilities/postProcessing/dataConversion/smapToFoam/CMakeLists.txt
index 890c2172c..2cc08608d 100644
--- a/applications/utilities/postProcessing/dataConversion/smapToFoam/CMakeLists.txt
+++ b/applications/utilities/postProcessing/dataConversion/smapToFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   smapToFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(smapToFoam
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/foamCalc/CMakeLists.txt b/applications/utilities/postProcessing/foamCalc/CMakeLists.txt
index d2fcdc9ae..bbbdbe983 100644
--- a/applications/utilities/postProcessing/foamCalc/CMakeLists.txt
+++ b/applications/utilities/postProcessing/foamCalc/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   foamCalc.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(foamCalc
   DEPENDS foamCalcFunctions
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/graphics/CMakeLists.txt b/applications/utilities/postProcessing/graphics/CMakeLists.txt
index c4cc4480b..885f85a56 100644
--- a/applications/utilities/postProcessing/graphics/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/CMakeLists.txt
@@ -32,6 +32,6 @@
 add_subdirectory(newEnsightFoamReader)
 #add_subdirectory(PV3FoamReader)
 #add_subdirectory(PVFoamReader)
-#add_subdirectory(PV4FoamReader)
+add_subdirectory(PV4FoamReader)
 #add_subdirectory(fieldview9Reader)
 add_subdirectory(ensightFoamReader)
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/CMakeLists.txt
index 4cd07ea3a..d984281b3 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   vtkPV3Foam.C
   vtkPV3FoamFields.C
   vtkPV3FoamMesh.C
@@ -43,8 +43,6 @@ list(APPEND sources
   vtkPV3FoamUtilities.C
 )
 
-add_foam_library(vtkPV3Foam SHARED ${sources})
+add_foam_library(vtkPV3Foam SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(vtkPV3Foam PUBLIC foam)
diff --git a/applications/utilities/postProcessing/graphics/PV4FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4FoamReader/CMakeLists.txt
index 91ea5dac0..746fa6ffc 100644
--- a/applications/utilities/postProcessing/graphics/PV4FoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV4FoamReader/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
@@ -29,4 +30,5 @@
 #
 # --------------------------------------------------------------------------
 
-add_subdirectory(vtkPV4Foam)
\ No newline at end of file
+add_subdirectory(vtkPV4Foam)
+add_subdirectory(PV4FoamReader)
diff --git a/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/CMakeLists.txt
index aa91849d0..390c417b3 100644
--- a/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV4FoamReader/vtkPV4Foam/CMakeLists.txt
@@ -30,7 +30,9 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+include(${PARAVIEW_USE_FILE})
+
+list(APPEND SOURCES
   vtkPV4Foam.C
   vtkPV4FoamFields.C
   vtkPV4FoamMesh.C
@@ -43,8 +45,10 @@ list(APPEND sources
   vtkPV4FoamUtilities.C
 )
 
-add_foam_library(vtkPV4Foam SHARED ${sources})
+add_foam_library(vtkPV4Foam SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
-#target_link_libraries(vtkPV4Foam finiteVolume)
+target_link_libraries(vtkPV4Foam finiteVolume)
+target_include_directories(vtkPV4Foam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../PV4FoamReader>
+#  $<INSTALL_INTERFACE:include/mylib>
+)
diff --git a/applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/CMakeLists.txt
index 8639bf1a5..6a5d8784b 100644
--- a/applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/CMakeLists.txt
@@ -30,14 +30,12 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   vtkFoam.C
   vtkFoamAddInternalMesh.C
   vtkFoamAddPatch.C
 )
 
-add_foam_library(vtkFoam SHARED ${sources})
+add_foam_library(vtkFoam SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(vtkFoam finiteVolume)
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt
index be60053bd..dcb8f431b 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt
@@ -6,51 +6,22 @@
 # the pqReader.xml file contains xml defining readers with their
 # file extensions and descriptions.
 
-cmake_minimum_required(VERSION 2.4)
-
-if(COMMAND cmake_policy)
-    cmake_policy(SET CMP0003 NEW)
-endif(COMMAND cmake_policy)
-
-FIND_PACKAGE(ParaView REQUIRED)
 INCLUDE(${PARAVIEW_USE_FILE})
 
-LINK_DIRECTORIES(
-    $ENV{FOAM_LIBBIN}
-)
-
-INCLUDE_DIRECTORIES(
-    $ENV{WM_PROJECT_DIR}/src/foam/lnInclude
-    $ENV{WM_PROJECT_DIR}/src/OSspecific/$ENV{WM_OSTYPE}/lnInclude
-    $ENV{WM_PROJECT_DIR}/src/finiteVolume/lnInclude
-    ${PROJECT_SOURCE_DIR}/../vtkPVFoam
-)
-
-ADD_DEFINITIONS(
-    -std=c++11
-    -DWM_$ENV{WM_PRECISION_OPTION}
-    -DWM_LABEL_SIZE=$ENV{WM_LABEL_SIZE}
-)
-
 # Set output library destination to plugin folder
-SET(
-    LIBRARY_OUTPUT_PATH $ENV{PV_PLUGIN_PATH}
-    CACHE INTERNAL
-    "Single output directory for building all libraries."
-)
+#SET(
+#  LIBRARY_OUTPUT_PATH $ENV{PV_PLUGIN_PATH}
+#  CACHE INTERNAL
+#  "Single output directory for building all libraries."
+#)
 
 # Build the server-side plugin
 ADD_PARAVIEW_PLUGIN(
-    PVFoamReader_SM "1.0"
-    SERVER_MANAGER_XML PVFoamReader_SM.xml
-    SERVER_MANAGER_SOURCES vtkPVFoamReader.cxx
+  PV4FoamReader_SM "1.0"
+  SERVER_MANAGER_XML PV4FoamReader_SM.xml
+  SERVER_MANAGER_SOURCES vtkPV4FoamReader.cxx
 )
 
-TARGET_LINK_LIBRARIES(
-    PVFoamReader_SM
-    foam
-    finiteVolume
-    vtkPVFoam
-    pqCore
-)
+TARGET_LINK_LIBRARIES(PV4FoamReader_SM PUBLIC vtkPV4Foam pqCore)
+
 #-----------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoamReader.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoamReader.cxx
index 82a343b20..53ea3b37f 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoamReader.cxx
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoamReader.cxx
@@ -1,7 +1,7 @@
 /*=========================================================================
 
   Program:   Visualization Toolkit
-  Module:    $RCSfile: vtkPVFoamReader.cxx,v $
+  Module:    $RCSfile: vtkPV4FoamReader.cxx,v $
 
   Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
   All rights reserved.
@@ -13,7 +13,10 @@
 
 =========================================================================*/
 
-#include "vtkPVFoamReader.h"
+#include "vtkPV4FoamReader.h"
+
+// Foam includes
+#include "vtkPV4Foam.H"
 
 #include "pqApplicationCore.h"
 #include "pqRenderView.h"
@@ -30,14 +33,11 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkStringArray.h"
 
-// Foam includes
-#include "vtkPVFoam.H"
-
-vtkStandardNewMacro(vtkPVFoamReader);
+vtkStandardNewMacro(vtkPV4FoamReader);
 
 #undef EXPERIMENTAL_TIME_CACHING
 
-vtkPVFoamReader::vtkPVFoamReader()
+vtkPV4FoamReader::vtkPV4FoamReader()
 {
     Debug = 0;
     vtkDebugMacro(<<"Constructor");
@@ -49,7 +49,7 @@ vtkPVFoamReader::vtkPVFoamReader()
 
     output0_  = NULL;
 
-#ifdef VTKPVFOAM_DUALPORT
+#ifdef VTKPV4FOAM_DUALPORT
     // Add second output for the Lagrangian
     this->SetNumberOfOutputPorts(2);
     vtkMultiBlockDataSet *lagrangian = vtkMultiBlockDataSet::New();
@@ -65,7 +65,6 @@ vtkPVFoamReader::vtkPVFoamReader()
     CacheMesh = 1;
 
     ExtrapolatePatches = 0;
-    UseVTKPolyhedron = 0;
     IncludeSets = 0;
     IncludeZones = 0;
     ShowPatchNames = 0;
@@ -82,7 +81,7 @@ vtkPVFoamReader::vtkPVFoamReader()
     SelectionObserver = vtkCallbackCommand::New();
     SelectionObserver->SetCallback
     (
-        &vtkPVFoamReader::SelectionModifiedCallback
+        &vtkPV4FoamReader::SelectionModifiedCallback
     );
     SelectionObserver->SetClientData(this);
 
@@ -109,7 +108,7 @@ vtkPVFoamReader::vtkPVFoamReader()
 }
 
 
-vtkPVFoamReader::~vtkPVFoamReader()
+vtkPV4FoamReader::~vtkPV4FoamReader()
 {
     vtkDebugMacro(<<"Deconstructor");
 
@@ -141,7 +140,7 @@ vtkPVFoamReader::~vtkPVFoamReader()
 
 
 // Do everything except set the output info
-int vtkPVFoamReader::RequestInformation
+int vtkPV4FoamReader::RequestInformation
 (
     vtkInformation* vtkNotUsed(request),
     vtkInformationVector** vtkNotUsed(inputVector),
@@ -150,7 +149,7 @@ int vtkPVFoamReader::RequestInformation
 {
     vtkDebugMacro(<<"RequestInformation");
 
-    if (Foam::vtkPVFoam::debug)
+    if (Foam::vtkPV4Foam::debug)
     {
         cout<<"REQUEST_INFORMATION\n";
     }
@@ -163,7 +162,7 @@ int vtkPVFoamReader::RequestInformation
 
     int nInfo = outputVector->GetNumberOfInformationObjects();
 
-    if (Foam::vtkPVFoam::debug)
+    if (Foam::vtkPV4Foam::debug)
     {
         cout<<"RequestInformation with " << nInfo << " item(s)\n";
         for (int infoI = 0; infoI < nInfo; ++infoI)
@@ -174,7 +173,7 @@ int vtkPVFoamReader::RequestInformation
 
     if (!foamData_)
     {
-        foamData_ = new Foam::vtkPVFoam(FileName, this);
+        foamData_ = new Foam::vtkPV4Foam(FileName, this);
     }
     else
     {
@@ -211,7 +210,7 @@ int vtkPVFoamReader::RequestInformation
         timeRange[0] = timeSteps[0];
         timeRange[1] = timeSteps[nTimeSteps-1];
 
-        if (Foam::vtkPVFoam::debug > 1)
+        if (Foam::vtkPV4Foam::debug > 1)
         {
             cout<<"nTimeSteps " << nTimeSteps << "\n"
                 <<"timeRange " << timeRange[0] << " to " << timeRange[1]
@@ -241,7 +240,7 @@ int vtkPVFoamReader::RequestInformation
 
 
 // Set the output info
-int vtkPVFoamReader::RequestData
+int vtkPV4FoamReader::RequestData
 (
     vtkInformation* vtkNotUsed(request),
     vtkInformationVector** vtkNotUsed(inputVector),
@@ -265,7 +264,7 @@ int vtkPVFoamReader::RequestData
 
     int nInfo = outputVector->GetNumberOfInformationObjects();
 
-    if (Foam::vtkPVFoam::debug)
+    if (Foam::vtkPV4Foam::debug)
     {
         cout<<"RequestData with " << nInfo << " item(s)\n";
         for (int infoI = 0; infoI < nInfo; ++infoI)
@@ -283,7 +282,7 @@ int vtkPVFoamReader::RequestData
     // taking port0 as the lead for other outputs would be nice, but fails when
     // a filter is added - we need to check everything
     // but since PREVIOUS_UPDATE_TIME_STEPS() is protected, relay the logic
-    // to the vtkPVFoam::setTime() method
+    // to the vtkPV4Foam::setTime() method
     for (int infoI = 0; infoI < nInfo; ++infoI)
     {
         vtkInformation *outInfo = outputVector->GetInformationObject(infoI);
@@ -315,7 +314,7 @@ int vtkPVFoamReader::RequestData
         )
     );
 
-    if (Foam::vtkPVFoam::debug)
+    if (Foam::vtkPV4Foam::debug)
     {
         cout<< "update output with "
             << output->GetNumberOfBlocks() << " blocks\n";
@@ -343,7 +342,7 @@ int vtkPVFoamReader::RequestData
         output->ShallowCopy(output0_);
     }
 
-    if (Foam::vtkPVFoam::debug)
+    if (Foam::vtkPV4Foam::debug)
     {
         if (needsUpdate)
         {
@@ -363,7 +362,7 @@ int vtkPVFoamReader::RequestData
 
 #else
 
-#ifdef VTKPVFOAM_DUALPORT
+#ifdef VTKPV4FOAM_DUALPORT
     foamData_->Update
     (
         output,
@@ -397,7 +396,7 @@ int vtkPVFoamReader::RequestData
 }
 
 
-void vtkPVFoamReader::addPatchNamesToView()
+void vtkPV4FoamReader::addPatchNamesToView()
 {
     pqApplicationCore* appCore = pqApplicationCore::instance();
 
@@ -417,7 +416,7 @@ void vtkPVFoamReader::addPatchNamesToView()
 }
 
 
-void vtkPVFoamReader::removePatchNamesFromView()
+void vtkPV4FoamReader::removePatchNamesFromView()
 {
     pqApplicationCore* appCore = pqApplicationCore::instance();
 
@@ -437,7 +436,7 @@ void vtkPVFoamReader::removePatchNamesFromView()
 }
 
 
-void vtkPVFoamReader::PrintSelf(ostream& os, vtkIndent indent)
+void vtkPV4FoamReader::PrintSelf(ostream& os, vtkIndent indent)
 {
     vtkDebugMacro(<<"PrintSelf");
 
@@ -454,7 +453,7 @@ void vtkPVFoamReader::PrintSelf(ostream& os, vtkIndent indent)
 }
 
 
-int vtkPVFoamReader::GetTimeStep()
+int vtkPV4FoamReader::GetTimeStep()
 {
     return foamData_ ? foamData_->timeIndex() : -1;
 }
@@ -463,35 +462,35 @@ int vtkPVFoamReader::GetTimeStep()
 // ----------------------------------------------------------------------
 // Parts selection list control
 
-vtkDataArraySelection* vtkPVFoamReader::GetPartSelection()
+vtkDataArraySelection* vtkPV4FoamReader::GetPartSelection()
 {
     vtkDebugMacro(<<"GetPartSelection");
     return PartSelection;
 }
 
 
-int vtkPVFoamReader::GetNumberOfPartArrays()
+int vtkPV4FoamReader::GetNumberOfPartArrays()
 {
     vtkDebugMacro(<<"GetNumberOfPartArrays");
     return PartSelection->GetNumberOfArrays();
 }
 
 
-const char* vtkPVFoamReader::GetPartArrayName(int index)
+const char* vtkPV4FoamReader::GetPartArrayName(int index)
 {
     vtkDebugMacro(<<"GetPartArrayName");
     return PartSelection->GetArrayName(index);
 }
 
 
-int vtkPVFoamReader::GetPartArrayStatus(const char* name)
+int vtkPV4FoamReader::GetPartArrayStatus(const char* name)
 {
     vtkDebugMacro(<<"GetPartArrayStatus");
     return PartSelection->ArrayIsEnabled(name);
 }
 
 
-void vtkPVFoamReader::SetPartArrayStatus(const char* name, int status)
+void vtkPV4FoamReader::SetPartArrayStatus(const char* name, int status)
 {
     vtkDebugMacro(<<"SetPartArrayStatus");
     if (status)
@@ -508,35 +507,35 @@ void vtkPVFoamReader::SetPartArrayStatus(const char* name, int status)
 // ----------------------------------------------------------------------
 // volField selection list control
 
-vtkDataArraySelection* vtkPVFoamReader::GetVolFieldSelection()
+vtkDataArraySelection* vtkPV4FoamReader::GetVolFieldSelection()
 {
     vtkDebugMacro(<<"GetVolFieldSelection");
     return VolFieldSelection;
 }
 
 
-int vtkPVFoamReader::GetNumberOfVolFieldArrays()
+int vtkPV4FoamReader::GetNumberOfVolFieldArrays()
 {
     vtkDebugMacro(<<"GetNumberOfVolFieldArrays");
     return VolFieldSelection->GetNumberOfArrays();
 }
 
 
-const char* vtkPVFoamReader::GetVolFieldArrayName(int index)
+const char* vtkPV4FoamReader::GetVolFieldArrayName(int index)
 {
     vtkDebugMacro(<<"GetVolFieldArrayName");
     return VolFieldSelection->GetArrayName(index);
 }
 
 
-int vtkPVFoamReader::GetVolFieldArrayStatus(const char* name)
+int vtkPV4FoamReader::GetVolFieldArrayStatus(const char* name)
 {
     vtkDebugMacro(<<"GetVolFieldArrayStatus");
     return VolFieldSelection->ArrayIsEnabled(name);
 }
 
 
-void vtkPVFoamReader::SetVolFieldArrayStatus(const char* name, int status)
+void vtkPV4FoamReader::SetVolFieldArrayStatus(const char* name, int status)
 {
     vtkDebugMacro(<<"SetVolFieldArrayStatus");
     if (status)
@@ -553,35 +552,35 @@ void vtkPVFoamReader::SetVolFieldArrayStatus(const char* name, int status)
 // ----------------------------------------------------------------------
 // pointField selection list control
 
-vtkDataArraySelection* vtkPVFoamReader::GetPointFieldSelection()
+vtkDataArraySelection* vtkPV4FoamReader::GetPointFieldSelection()
 {
     vtkDebugMacro(<<"GetPointFieldSelection");
     return PointFieldSelection;
 }
 
 
-int vtkPVFoamReader::GetNumberOfPointFieldArrays()
+int vtkPV4FoamReader::GetNumberOfPointFieldArrays()
 {
     vtkDebugMacro(<<"GetNumberOfPointFieldArrays");
     return PointFieldSelection->GetNumberOfArrays();
 }
 
 
-const char* vtkPVFoamReader::GetPointFieldArrayName(int index)
+const char* vtkPV4FoamReader::GetPointFieldArrayName(int index)
 {
     vtkDebugMacro(<<"GetPointFieldArrayName");
     return PointFieldSelection->GetArrayName(index);
 }
 
 
-int vtkPVFoamReader::GetPointFieldArrayStatus(const char* name)
+int vtkPV4FoamReader::GetPointFieldArrayStatus(const char* name)
 {
     vtkDebugMacro(<<"GetPointFieldArrayStatus");
     return PointFieldSelection->ArrayIsEnabled(name);
 }
 
 
-void vtkPVFoamReader::SetPointFieldArrayStatus(const char* name, int status)
+void vtkPV4FoamReader::SetPointFieldArrayStatus(const char* name, int status)
 {
     vtkDebugMacro(<<"SetPointFieldArrayStatus");
     if (status)
@@ -598,35 +597,35 @@ void vtkPVFoamReader::SetPointFieldArrayStatus(const char* name, int status)
 // ----------------------------------------------------------------------
 // lagrangianField selection list control
 
-vtkDataArraySelection* vtkPVFoamReader::GetLagrangianFieldSelection()
+vtkDataArraySelection* vtkPV4FoamReader::GetLagrangianFieldSelection()
 {
     vtkDebugMacro(<<"GetLagrangianFieldSelection");
     return LagrangianFieldSelection;
 }
 
 
-int vtkPVFoamReader::GetNumberOfLagrangianFieldArrays()
+int vtkPV4FoamReader::GetNumberOfLagrangianFieldArrays()
 {
     vtkDebugMacro(<<"GetNumberOfLagrangianFieldArrays");
     return LagrangianFieldSelection->GetNumberOfArrays();
 }
 
 
-const char* vtkPVFoamReader::GetLagrangianFieldArrayName(int index)
+const char* vtkPV4FoamReader::GetLagrangianFieldArrayName(int index)
 {
     vtkDebugMacro(<<"GetLagrangianFieldArrayName");
     return LagrangianFieldSelection->GetArrayName(index);
 }
 
 
-int vtkPVFoamReader::GetLagrangianFieldArrayStatus(const char* name)
+int vtkPV4FoamReader::GetLagrangianFieldArrayStatus(const char* name)
 {
     vtkDebugMacro(<<"GetLagrangianFieldArrayStatus");
     return LagrangianFieldSelection->ArrayIsEnabled(name);
 }
 
 
-void vtkPVFoamReader::SetLagrangianFieldArrayStatus
+void vtkPV4FoamReader::SetLagrangianFieldArrayStatus
 (
     const char* name,
     int status
@@ -646,7 +645,7 @@ void vtkPVFoamReader::SetLagrangianFieldArrayStatus
 
 // ----------------------------------------------------------------------
 
-void vtkPVFoamReader::SelectionModifiedCallback
+void vtkPV4FoamReader::SelectionModifiedCallback
 (
     vtkObject*,
     unsigned long,
@@ -654,18 +653,18 @@ void vtkPVFoamReader::SelectionModifiedCallback
     void*
 )
 {
-    static_cast<vtkPVFoamReader*>(clientdata)->SelectionModified();
+    static_cast<vtkPV4FoamReader*>(clientdata)->SelectionModified();
 }
 
 
-void vtkPVFoamReader::SelectionModified()
+void vtkPV4FoamReader::SelectionModified()
 {
     vtkDebugMacro(<<"SelectionModified");
     Modified();
 }
 
 
-int vtkPVFoamReader::FillOutputPortInformation
+int vtkPV4FoamReader::FillOutputPortInformation
 (
     int port,
     vtkInformation* info
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/ensightFoamReader/CMakeLists.txt
index 6096b9340..2addb8407 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/CMakeLists.txt
@@ -30,12 +30,10 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   libuserd.C
 )
 
-add_foam_library(userd-foam SHARED ${sources})
+add_foam_library(userd-foam SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(userd-foam finiteVolume lagrangianBasic)
diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/fieldview9Reader/CMakeLists.txt
index 5becc8820..03a5d898f 100644
--- a/applications/utilities/postProcessing/graphics/fieldview9Reader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   errno.c
   readerDatabase.C
   fieldview9Reader.C
@@ -44,5 +44,5 @@ endif()
 
 add_foam_executable(fvbinFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/graphics/newEnsightFoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/newEnsightFoamReader/CMakeLists.txt
index 512bf3a77..389b4474c 100644
--- a/applications/utilities/postProcessing/graphics/newEnsightFoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/newEnsightFoamReader/CMakeLists.txt
@@ -30,12 +30,10 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   libuserd.C
 )
 
-add_foam_library(userd-newFoam SHARED ${sources})
+add_foam_library(userd-newFoam SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(userd-newFoam PUBLIC finiteVolume finiteArea lagrangianBasic)
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/CMakeLists.txt b/applications/utilities/postProcessing/lagrangian/particleTracks/CMakeLists.txt
index 58676b4d2..c8ea16d41 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/CMakeLists.txt
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   particleTracks.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(particleTracks
   DEPENDS finiteVolume lagrangianBasic
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/miscellaneous/calcLevelSet/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/calcLevelSet/CMakeLists.txt
index 7e8ff2511..843313997 100644
--- a/applications/utilities/postProcessing/miscellaneous/calcLevelSet/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/calcLevelSet/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   calcLevelSet.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(calcLevelSet
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/CMakeLists.txt
index 504d076e0..b8ccce56a 100644
--- a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   dsmcFieldsCalc.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(dsmcFieldsCalc
   DEPENDS postCalc utilityFunctionObjects dsmc 
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/CMakeLists.txt
index 9c0ccd653..ccea414db 100644
--- a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   engineCompRatio.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(engineCompRatio
   DEPENDS engine
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/CMakeLists.txt
index 491e3dd95..ddb8c56da 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   execFlowFunctionObjects.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(execFlowFunctionObjects
   DEPENDS postCalc incompressibleRASModels incompressibleLESModels compressibleRASModels compressibleLESModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/pdfPlot/CMakeLists.txt
index dfb46b661..457ac6f6c 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   pdfPlot.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(pdfPlot
   DEPENDS finiteVolume pdf
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/postChannel/CMakeLists.txt
index 850ba6342..c357d54ed 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   postChannel.C
   channelIndex.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(postChannel
   DEPENDS sampling
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/miscellaneous/ptot/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/ptot/CMakeLists.txt
index 28f8033ff..86198e6c1 100644
--- a/applications/utilities/postProcessing/miscellaneous/ptot/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/ptot/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   ptot.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(ptot
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/miscellaneous/wdot/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/wdot/CMakeLists.txt
index 9dc8e59c4..06e7c5539 100644
--- a/applications/utilities/postProcessing/miscellaneous/wdot/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/wdot/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   wdot.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(wdot
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/miscellaneous/writeCellCentres/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/writeCellCentres/CMakeLists.txt
index b672010b8..bb902dde3 100644
--- a/applications/utilities/postProcessing/miscellaneous/writeCellCentres/CMakeLists.txt
+++ b/applications/utilities/postProcessing/miscellaneous/writeCellCentres/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   writeCellCentres.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(writeCellCentres
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/multiSolver/CMakeLists.txt b/applications/utilities/postProcessing/multiSolver/CMakeLists.txt
index 2eee6d38e..cbef3e05a 100644
--- a/applications/utilities/postProcessing/multiSolver/CMakeLists.txt
+++ b/applications/utilities/postProcessing/multiSolver/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   multiSolver.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(multiSolver
   DEPENDS finiteVolume multiSolverLib
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/patch/patchAverage/CMakeLists.txt b/applications/utilities/postProcessing/patch/patchAverage/CMakeLists.txt
index bc83b9bce..58c1bb4fe 100644
--- a/applications/utilities/postProcessing/patch/patchAverage/CMakeLists.txt
+++ b/applications/utilities/postProcessing/patch/patchAverage/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   patchAverage.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(patchAverage
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/patch/patchIntegrate/CMakeLists.txt b/applications/utilities/postProcessing/patch/patchIntegrate/CMakeLists.txt
index 9c9928f54..85b5c5fd2 100644
--- a/applications/utilities/postProcessing/patch/patchIntegrate/CMakeLists.txt
+++ b/applications/utilities/postProcessing/patch/patchIntegrate/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   patchIntegrate.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(patchIntegrate
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/sampling/probeLocations/CMakeLists.txt b/applications/utilities/postProcessing/sampling/probeLocations/CMakeLists.txt
index f2158ce6e..94f0ad1db 100644
--- a/applications/utilities/postProcessing/sampling/probeLocations/CMakeLists.txt
+++ b/applications/utilities/postProcessing/sampling/probeLocations/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   probeLocations.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(probeLocations
   DEPENDS sampling
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/sampling/sample/CMakeLists.txt b/applications/utilities/postProcessing/sampling/sample/CMakeLists.txt
index eaac1d4db..8b66c021d 100644
--- a/applications/utilities/postProcessing/sampling/sample/CMakeLists.txt
+++ b/applications/utilities/postProcessing/sampling/sample/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   sample.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(sample
   DEPENDS sampling
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/scalarField/pPrime2/CMakeLists.txt b/applications/utilities/postProcessing/scalarField/pPrime2/CMakeLists.txt
index 189b734e6..ceb3bf3ca 100644
--- a/applications/utilities/postProcessing/scalarField/pPrime2/CMakeLists.txt
+++ b/applications/utilities/postProcessing/scalarField/pPrime2/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   pPrime2.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(pPrime2
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/stressField/calcPTot/CMakeLists.txt b/applications/utilities/postProcessing/stressField/calcPTot/CMakeLists.txt
index 7081e2bf3..62eb1b605 100644
--- a/applications/utilities/postProcessing/stressField/calcPTot/CMakeLists.txt
+++ b/applications/utilities/postProcessing/stressField/calcPTot/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   calcPTot.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(calcPTot
   DEPENDS interfaceProperties incompressibleTransportModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/stressField/interFoamPressure/CMakeLists.txt b/applications/utilities/postProcessing/stressField/interFoamPressure/CMakeLists.txt
index b9d23f3bb..4d864a331 100644
--- a/applications/utilities/postProcessing/stressField/interFoamPressure/CMakeLists.txt
+++ b/applications/utilities/postProcessing/stressField/interFoamPressure/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   interFoamPressure.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(interFoamPressure
   DEPENDS interfaceProperties incompressibleTransportModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/stressField/solidStress/CMakeLists.txt b/applications/utilities/postProcessing/stressField/solidStress/CMakeLists.txt
index be2fb10dd..dcdfbfa24 100644
--- a/applications/utilities/postProcessing/stressField/solidStress/CMakeLists.txt
+++ b/applications/utilities/postProcessing/stressField/solidStress/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   solidStress.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(solidStress
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/stressField/stressComponents/CMakeLists.txt b/applications/utilities/postProcessing/stressField/stressComponents/CMakeLists.txt
index fcc467ac9..5bf9455f9 100644
--- a/applications/utilities/postProcessing/stressField/stressComponents/CMakeLists.txt
+++ b/applications/utilities/postProcessing/stressField/stressComponents/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   stressComponents.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(stressComponents
   DEPENDS incompressibleRASModels incompressibleTransportModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/turbulence/R/CMakeLists.txt b/applications/utilities/postProcessing/turbulence/R/CMakeLists.txt
index 45f041004..2f811a95e 100644
--- a/applications/utilities/postProcessing/turbulence/R/CMakeLists.txt
+++ b/applications/utilities/postProcessing/turbulence/R/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   R.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(R
   DEPENDS incompressibleRASModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/CMakeLists.txt b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/CMakeLists.txt
index 8e67cbc59..54f9b4485 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/CMakeLists.txt
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   createTurbulenceFields.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(createTurbulenceFields
   DEPENDS incompressibleRASModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/velocityField/Co/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/Co/CMakeLists.txt
index 25e4032da..5f66467e8 100644
--- a/applications/utilities/postProcessing/velocityField/Co/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/Co/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   Co.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(Co
   DEPENDS postCalc
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/velocityField/Lambda2/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/Lambda2/CMakeLists.txt
index 0111a65b0..df8cda3c7 100644
--- a/applications/utilities/postProcessing/velocityField/Lambda2/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/Lambda2/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   Lambda2.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(Lambda2
   DEPENDS postCalc
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/velocityField/Mach/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/Mach/CMakeLists.txt
index 6dcf7d009..bbf0199f3 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/Mach/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   Mach.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(Mach
   DEPENDS postCalc reactionThermophysicalModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/velocityField/Pe/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/Pe/CMakeLists.txt
index d7fb4190f..aee45c43e 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/Pe/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   Pe.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(Pe
   DEPENDS postCalc incompressibleRASModels incompressibleLESModels compressibleRASModels compressibleLESModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/velocityField/Q/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/Q/CMakeLists.txt
index d646ba4d1..fa21a3551 100644
--- a/applications/utilities/postProcessing/velocityField/Q/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/Q/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   Q.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(Q
   DEPENDS postCalc
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/velocityField/enstrophy/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/enstrophy/CMakeLists.txt
index 2c20b166e..0fca5cdfa 100644
--- a/applications/utilities/postProcessing/velocityField/enstrophy/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/enstrophy/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   enstrophy.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(enstrophy
   DEPENDS postCalc
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/velocityField/flowType/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/flowType/CMakeLists.txt
index acdf74f66..b6f36c465 100644
--- a/applications/utilities/postProcessing/velocityField/flowType/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/flowType/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   flowType.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(flowType
   DEPENDS postCalc
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/velocityField/streamFunction/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/streamFunction/CMakeLists.txt
index edad653b4..48fc08b00 100644
--- a/applications/utilities/postProcessing/velocityField/streamFunction/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/streamFunction/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   streamFunction.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(streamFunction
   DEPENDS postCalc
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/velocityField/uprime/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/uprime/CMakeLists.txt
index 112e079ef..c031dab1c 100644
--- a/applications/utilities/postProcessing/velocityField/uprime/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/uprime/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   uprime.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(uprime
   DEPENDS postCalc
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/velocityField/vorticity/CMakeLists.txt b/applications/utilities/postProcessing/velocityField/vorticity/CMakeLists.txt
index 9ec2fcea1..7edb82ca8 100644
--- a/applications/utilities/postProcessing/velocityField/vorticity/CMakeLists.txt
+++ b/applications/utilities/postProcessing/velocityField/vorticity/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   vorticity.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(vorticity
   DEPENDS postCalc
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/viscoelastic/PSD/CMakeLists.txt b/applications/utilities/postProcessing/viscoelastic/PSD/CMakeLists.txt
index 6da419ae5..c330f25ea 100644
--- a/applications/utilities/postProcessing/viscoelastic/PSD/CMakeLists.txt
+++ b/applications/utilities/postProcessing/viscoelastic/PSD/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   PSD.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(PSD
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/viscoelastic/stressDifferences/CMakeLists.txt b/applications/utilities/postProcessing/viscoelastic/stressDifferences/CMakeLists.txt
index b5ae8d4ae..8daa8bdd8 100644
--- a/applications/utilities/postProcessing/viscoelastic/stressDifferences/CMakeLists.txt
+++ b/applications/utilities/postProcessing/viscoelastic/stressDifferences/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   stressDifferences.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(stressDifferences
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/viscoelastic/stressSymmComponents/CMakeLists.txt b/applications/utilities/postProcessing/viscoelastic/stressSymmComponents/CMakeLists.txt
index bec312fa1..521f1725e 100644
--- a/applications/utilities/postProcessing/viscoelastic/stressSymmComponents/CMakeLists.txt
+++ b/applications/utilities/postProcessing/viscoelastic/stressSymmComponents/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   stressSymmComponents.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(stressSymmComponents
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/wall/wallGradU/CMakeLists.txt b/applications/utilities/postProcessing/wall/wallGradU/CMakeLists.txt
index 2848cc807..5eb439908 100644
--- a/applications/utilities/postProcessing/wall/wallGradU/CMakeLists.txt
+++ b/applications/utilities/postProcessing/wall/wallGradU/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   wallGradU.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(wallGradU
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/CMakeLists.txt b/applications/utilities/postProcessing/wall/wallHeatFlux/CMakeLists.txt
index a06b9cae4..528726b7c 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/CMakeLists.txt
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   wallHeatFlux.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(wallHeatFlux
   DEPENDS reactionThermophysicalModels compressibleRASModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/CMakeLists.txt b/applications/utilities/postProcessing/wall/wallShearStress/CMakeLists.txt
index a36a8a949..be75326a3 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/CMakeLists.txt
+++ b/applications/utilities/postProcessing/wall/wallShearStress/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   wallShearStress.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(wallShearStress
   DEPENDS incompressibleRASModels compressibleRASModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/wall/yPlusLES/CMakeLists.txt b/applications/utilities/postProcessing/wall/yPlusLES/CMakeLists.txt
index 6713d64af..5b3bbc6b5 100644
--- a/applications/utilities/postProcessing/wall/yPlusLES/CMakeLists.txt
+++ b/applications/utilities/postProcessing/wall/yPlusLES/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   yPlusLES.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(yPlusLES
   DEPENDS incompressibleLESModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/CMakeLists.txt b/applications/utilities/postProcessing/wall/yPlusRAS/CMakeLists.txt
index 9eb636d1f..6a7c0f8a1 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/CMakeLists.txt
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   yPlusRAS.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(yPlusRAS
   DEPENDS incompressibleRASModels compressibleRASModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/CMakeLists.txt b/applications/utilities/preProcessing/applyBoundaryLayer/CMakeLists.txt
index 7961fcc92..31cd15c05 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/CMakeLists.txt
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   applyBoundaryLayer.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(applyBoundaryLayer
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/CMakeLists.txt b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/CMakeLists.txt
index 6155b75f9..1ce0e5909 100644
--- a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/CMakeLists.txt
+++ b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   applyWallFunctionBoundaryConditions.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(applyWallFunctionBoundaryConditions
   DEPENDS incompressibleRASModels compressibleRASModels 
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/preProcessing/boxTurb/CMakeLists.txt b/applications/utilities/preProcessing/boxTurb/CMakeLists.txt
index dcdc26055..3400a7828 100644
--- a/applications/utilities/preProcessing/boxTurb/CMakeLists.txt
+++ b/applications/utilities/preProcessing/boxTurb/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   boxTurb.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(boxTurb
   DEPENDS finiteVolume randomProcesses
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/preProcessing/changeDictionary/CMakeLists.txt b/applications/utilities/preProcessing/changeDictionary/CMakeLists.txt
index 947ce8630..5ec5764e2 100644
--- a/applications/utilities/preProcessing/changeDictionary/CMakeLists.txt
+++ b/applications/utilities/preProcessing/changeDictionary/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   changeDictionary.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(changeDictionary
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/preProcessing/convertPhi/CMakeLists.txt b/applications/utilities/preProcessing/convertPhi/CMakeLists.txt
index 7d5c97161..af7f9f90e 100644
--- a/applications/utilities/preProcessing/convertPhi/CMakeLists.txt
+++ b/applications/utilities/preProcessing/convertPhi/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   convertPhi.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(convertPhi
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/preProcessing/dsmcInitialise/CMakeLists.txt b/applications/utilities/preProcessing/dsmcInitialise/CMakeLists.txt
index 0b8e13d9e..17cb6c458 100644
--- a/applications/utilities/preProcessing/dsmcInitialise/CMakeLists.txt
+++ b/applications/utilities/preProcessing/dsmcInitialise/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   dsmcInitialise.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(dsmcInitialise
   DEPENDS dsmc
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/preProcessing/engineSwirl/CMakeLists.txt b/applications/utilities/preProcessing/engineSwirl/CMakeLists.txt
index b5c4009d6..bc7eb070e 100644
--- a/applications/utilities/preProcessing/engineSwirl/CMakeLists.txt
+++ b/applications/utilities/preProcessing/engineSwirl/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   engineSwirl.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(engineSwirl
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/preProcessing/fluentDataToFoam/CMakeLists.txt b/applications/utilities/preProcessing/fluentDataToFoam/CMakeLists.txt
index aa4e73e5b..097085ed0 100644
--- a/applications/utilities/preProcessing/fluentDataToFoam/CMakeLists.txt
+++ b/applications/utilities/preProcessing/fluentDataToFoam/CMakeLists.txt
@@ -30,12 +30,12 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   fluentDataConverter.C
 )
 FLEX_TARGET(fluentDataToFoam fluentDataToFoam.L
   ${CMAKE_CURRENT_BINARY_DIR}/fluentDataToFoam.C COMPILE_FLAGS "-+")
-list(APPEND sources ${FLEX_fluentDataToFoam_OUTPUTS})
+list(APPEND SOURCES ${FLEX_fluentDataToFoam_OUTPUTS})
 
 # Set minimal environment for external compilation
 if(NOT FOAM_FOUND)
@@ -45,5 +45,9 @@ endif()
 
 add_foam_executable(fluentDataToFoam
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
+)
+target_include_directories(fluentDataToFoam PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+#  $<INSTALL_INTERFACE:include/mylib>
 )
diff --git a/applications/utilities/preProcessing/mapFields/CMakeLists.txt b/applications/utilities/preProcessing/mapFields/CMakeLists.txt
index 7212b8bf2..be8882ac2 100644
--- a/applications/utilities/preProcessing/mapFields/CMakeLists.txt
+++ b/applications/utilities/preProcessing/mapFields/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   mapLagrangian.C
   mapFields.C
 )
@@ -43,5 +43,5 @@ endif()
 
 add_foam_executable(mapFields
   DEPENDS sampling
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/preProcessing/mdInitialise/CMakeLists.txt b/applications/utilities/preProcessing/mdInitialise/CMakeLists.txt
index 97ec255d4..5f1746a32 100644
--- a/applications/utilities/preProcessing/mdInitialise/CMakeLists.txt
+++ b/applications/utilities/preProcessing/mdInitialise/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   mdInitialise.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(mdInitialise
   DEPENDS molecule molecularMeasurements
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/preProcessing/setFields/CMakeLists.txt b/applications/utilities/preProcessing/setFields/CMakeLists.txt
index bd8113bce..bd10818ce 100644
--- a/applications/utilities/preProcessing/setFields/CMakeLists.txt
+++ b/applications/utilities/preProcessing/setFields/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   setFields.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(setFields
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/solidMechanics/setMatFromCellZones/CMakeLists.txt b/applications/utilities/solidMechanics/setMatFromCellZones/CMakeLists.txt
index 70325a2d5..b57583c53 100644
--- a/applications/utilities/solidMechanics/setMatFromCellZones/CMakeLists.txt
+++ b/applications/utilities/solidMechanics/setMatFromCellZones/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   setMatFromCellZones.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(setMatFromCellZones
   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceAdd/CMakeLists.txt b/applications/utilities/surface/surfaceAdd/CMakeLists.txt
index 76e705b1b..d60affb89 100644
--- a/applications/utilities/surface/surfaceAdd/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceAdd/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceAdd.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceAdd
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceAutoPatch/CMakeLists.txt b/applications/utilities/surface/surfaceAutoPatch/CMakeLists.txt
index d4f377f4e..ac34c78bf 100644
--- a/applications/utilities/surface/surfaceAutoPatch/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceAutoPatch/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceAutoPatch.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceAutoPatch
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceCheck/CMakeLists.txt b/applications/utilities/surface/surfaceCheck/CMakeLists.txt
index b2603067c..1b7ec2110 100644
--- a/applications/utilities/surface/surfaceCheck/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceCheck/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceCheck.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceCheck
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceClean/CMakeLists.txt b/applications/utilities/surface/surfaceClean/CMakeLists.txt
index a173a5686..9a643f0d7 100644
--- a/applications/utilities/surface/surfaceClean/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceClean/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   collapseBase.C
   collapseEdge.C
   surfaceClean.C
@@ -44,5 +44,5 @@ endif()
 
 add_foam_executable(surfaceClean
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceCoarsen/CMakeLists.txt b/applications/utilities/surface/surfaceCoarsen/CMakeLists.txt
index 5472722a2..20e922e97 100644
--- a/applications/utilities/surface/surfaceCoarsen/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceCoarsen/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   bunnylod/progmesh.C
   bunnylod/vector.C
   surfaceCoarsen.C
@@ -44,11 +44,10 @@ endif()
 
 add_foam_executable(surfaceCoarsen
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
 
 target_include_directories(surfaceCoarsen PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/bunnylod>
-  $<INSTALL_INTERFACE:include/mylib>
+#  $<INSTALL_INTERFACE:include/mylib>
 )
-
diff --git a/applications/utilities/surface/surfaceConvert/CMakeLists.txt b/applications/utilities/surface/surfaceConvert/CMakeLists.txt
index ecc42e28c..2ce934692 100644
--- a/applications/utilities/surface/surfaceConvert/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceConvert/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceConvert.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceConvert
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceFeatureConvert/CMakeLists.txt b/applications/utilities/surface/surfaceFeatureConvert/CMakeLists.txt
index 3e73db52e..9d18c5b2e 100644
--- a/applications/utilities/surface/surfaceFeatureConvert/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceFeatureConvert/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceFeatureConvert.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceFeatureConvert
   DEPENDS meshTools edgeMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceFeatureExtract/CMakeLists.txt b/applications/utilities/surface/surfaceFeatureExtract/CMakeLists.txt
index 07fef5522..9c7cf1a0e 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceFeatureExtract/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceFeatureExtract.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceFeatureExtract
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceFind/CMakeLists.txt b/applications/utilities/surface/surfaceFind/CMakeLists.txt
index f081891eb..99831952f 100644
--- a/applications/utilities/surface/surfaceFind/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceFind/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceFind.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceFind
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceMeshConvert/CMakeLists.txt b/applications/utilities/surface/surfaceMeshConvert/CMakeLists.txt
index 6e6084fa7..d2ae4983e 100644
--- a/applications/utilities/surface/surfaceMeshConvert/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceMeshConvert/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceMeshConvert.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceMeshConvert
   DEPENDS meshTools surfMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceMeshConvertTesting/CMakeLists.txt b/applications/utilities/surface/surfaceMeshConvertTesting/CMakeLists.txt
index c115030b3..90e8b3f33 100644
--- a/applications/utilities/surface/surfaceMeshConvertTesting/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceMeshConvertTesting/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceMeshConvertTesting.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceMeshConvertTesting
   DEPENDS surfMesh meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceMeshExport/CMakeLists.txt b/applications/utilities/surface/surfaceMeshExport/CMakeLists.txt
index ee893b140..67f55a0a0 100644
--- a/applications/utilities/surface/surfaceMeshExport/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceMeshExport/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceMeshExport.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceMeshExport
   DEPENDS surfMesh meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceMeshImport/CMakeLists.txt b/applications/utilities/surface/surfaceMeshImport/CMakeLists.txt
index 8d82cd6e0..74bc8666f 100644
--- a/applications/utilities/surface/surfaceMeshImport/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceMeshImport/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceMeshImport.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceMeshImport
   DEPENDS surfMesh meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/CMakeLists.txt b/applications/utilities/surface/surfaceMeshTriangulate/CMakeLists.txt
index 0aa938ead..b8fee1f32 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceMeshTriangulate/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceMeshTriangulate.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceMeshTriangulate
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceOrient/CMakeLists.txt b/applications/utilities/surface/surfaceOrient/CMakeLists.txt
index c52b48857..a9ae0ce80 100644
--- a/applications/utilities/surface/surfaceOrient/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceOrient/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceOrient.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceOrient
   DEPENDS finiteVolume meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfacePointMerge/CMakeLists.txt b/applications/utilities/surface/surfacePointMerge/CMakeLists.txt
index 72252a817..175293cf4 100644
--- a/applications/utilities/surface/surfacePointMerge/CMakeLists.txt
+++ b/applications/utilities/surface/surfacePointMerge/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfacePointMerge.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfacePointMerge
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceRedistributePar/CMakeLists.txt b/applications/utilities/surface/surfaceRedistributePar/CMakeLists.txt
index cb77a81b5..45e6895bf 100644
--- a/applications/utilities/surface/surfaceRedistributePar/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceRedistributePar/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceRedistributePar.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceRedistributePar
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceRefineRedGreen/CMakeLists.txt b/applications/utilities/surface/surfaceRefineRedGreen/CMakeLists.txt
index 6173262c6..400cfed7d 100644
--- a/applications/utilities/surface/surfaceRefineRedGreen/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceRefineRedGreen/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceRefineRedGreen.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceRefineRedGreen
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceSmooth/CMakeLists.txt b/applications/utilities/surface/surfaceSmooth/CMakeLists.txt
index 997c13483..3514eca6b 100644
--- a/applications/utilities/surface/surfaceSmooth/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceSmooth/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceSmooth.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceSmooth
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceSplitByPatch/CMakeLists.txt b/applications/utilities/surface/surfaceSplitByPatch/CMakeLists.txt
index bbac1928c..e5b7ee2c4 100644
--- a/applications/utilities/surface/surfaceSplitByPatch/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceSplitByPatch/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceSplitByPatch.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceSplitByPatch
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/CMakeLists.txt b/applications/utilities/surface/surfaceSplitNonManifolds/CMakeLists.txt
index 77bda5b79..087f64dc0 100644
--- a/applications/utilities/surface/surfaceSplitNonManifolds/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceSplitNonManifolds/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceSplitNonManifolds.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceSplitNonManifolds
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceSubset/CMakeLists.txt b/applications/utilities/surface/surfaceSubset/CMakeLists.txt
index 5e3cbc942..0799b42fc 100644
--- a/applications/utilities/surface/surfaceSubset/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceSubset/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceSubset.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceSubset
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceToPatch/CMakeLists.txt b/applications/utilities/surface/surfaceToPatch/CMakeLists.txt
index ade30c434..e923d1417 100644
--- a/applications/utilities/surface/surfaceToPatch/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceToPatch/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   boundaryMesh.C
   surfaceToPatch.C
   treeDataPrimitivePatchName.C
@@ -44,5 +44,5 @@ endif()
 
 add_foam_executable(surfaceToPatch
   DEPENDS meshTools dynamicMesh
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/surface/surfaceTransformPoints/CMakeLists.txt b/applications/utilities/surface/surfaceTransformPoints/CMakeLists.txt
index 2fea45374..a4d93b1d8 100644
--- a/applications/utilities/surface/surfaceTransformPoints/CMakeLists.txt
+++ b/applications/utilities/surface/surfaceTransformPoints/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfaceTransformPoints.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(surfaceTransformPoints
   DEPENDS meshTools
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/thermophysical/IFCLookUpTableGen/CMakeLists.txt b/applications/utilities/thermophysical/IFCLookUpTableGen/CMakeLists.txt
index 56238b4f9..7e7e58866 100644
--- a/applications/utilities/thermophysical/IFCLookUpTableGen/CMakeLists.txt
+++ b/applications/utilities/thermophysical/IFCLookUpTableGen/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   IFCLookUpTableGen.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(IFCLookUpTableGen
   DEPENDS specie radiation
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/CMakeLists.txt b/applications/utilities/thermophysical/adiabaticFlameT/CMakeLists.txt
index 2af0e4a8c..6e3167e0d 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/CMakeLists.txt
+++ b/applications/utilities/thermophysical/adiabaticFlameT/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   adiabaticFlameT.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(adiabaticFlameT
   DEPENDS specie
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/thermophysical/chemkinToFoam/CMakeLists.txt b/applications/utilities/thermophysical/chemkinToFoam/CMakeLists.txt
index 1ebaaa13b..0e5bf2a69 100644
--- a/applications/utilities/thermophysical/chemkinToFoam/CMakeLists.txt
+++ b/applications/utilities/thermophysical/chemkinToFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   chemkinToFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(chemkinToFoam
   DEPENDS reactionThermophysicalModels
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/thermophysical/equilibriumCO/CMakeLists.txt b/applications/utilities/thermophysical/equilibriumCO/CMakeLists.txt
index 07e28259a..ff2fe6db7 100644
--- a/applications/utilities/thermophysical/equilibriumCO/CMakeLists.txt
+++ b/applications/utilities/thermophysical/equilibriumCO/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   equilibriumCO.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(equiriumCO
   DEPENDS specie
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/CMakeLists.txt b/applications/utilities/thermophysical/equilibriumFlameT/CMakeLists.txt
index 972b4ef58..e8250cd03 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/CMakeLists.txt
+++ b/applications/utilities/thermophysical/equilibriumFlameT/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   equilibriumFlameT.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(equiriumFlameT
   DEPENDS specie
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/CMakeLists.txt b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/CMakeLists.txt
index 77e2f720c..66e03f369 100644
--- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/CMakeLists.txt
+++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   mixtureAdiabaticFlameT.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(mixtureAdiabaticFlameT
   DEPENDS specie
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/cmake/FOAMMacros.cmake b/cmake/FOAMMacros.cmake
index d9d7d08e6..c442cb475 100644
--- a/cmake/FOAMMacros.cmake
+++ b/cmake/FOAMMacros.cmake
@@ -1,3 +1,35 @@
+# --------------------------------------------------------------------------
+#   ========                 |
+#   \      /  F ield         | foam-extend: Open Source CFD
+#    \    /   O peration     | Version:     4.1
+#     \  /    A nd           | Web:         http://www.foam-extend.org
+#      \/     M anipulation  | For copyright notice see file Copyright
+# --------------------------------------------------------------------------
+# License
+#     This file is part of foam-extend.
+#
+#     foam-extend is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation, either version 3 of the License, or {at your
+#     option} any later version.
+#
+#     foam-extend is distributed in the hope that it will be useful, but
+#     WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#     General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Description
+#     CMakeLists.txt file for libraries and applications
+#
+# Author
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
+#
+#
+# --------------------------------------------------------------------------
+
 add_custom_target(ImportMessage
   ${CMAKE_COMMAND} -E cmake_echo_color --red --bold
   "Using FOAM ${FOAM_VERSION} in ${CMAKE_CURRENT_LIST_DIR}"
@@ -63,5 +95,3 @@ function(add_foam_executable exe)
     add_dependencies(${exe} ImportMessage)
   endif()
 endfunction()
-
-
diff --git a/cmake/FOAMTargets.cmake b/cmake/FOAMTargets.cmake
deleted file mode 100644
index 0b241e548..000000000
--- a/cmake/FOAMTargets.cmake
+++ /dev/null
@@ -1,1406 +0,0 @@
-## Generated by CMake 3.5.1
-
-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
-   message(FATAL_ERROR "CMake >= 2.6.0 required")
-endif()
-cmake_policy(PUSH)
-cmake_policy(VERSION 2.6)
-#----------------------------------------------------------------
-# Generated CMake target import file.
-#----------------------------------------------------------------
-
-# Commands may need to know the format version.
-set(CMAKE_IMPORT_FILE_VERSION 1)
-
-# Protect against multiple inclusion, which would fail when already imported targets are added once more.
-set(_targetsDefined)
-set(_targetsNotDefined)
-set(_expectedTargets)
-foreach(_expectedTarget foam immersedBoundaryForceFunctionObject immersedBoundary immersedBoundaryTurbulence immersedBoundaryDynamicFvMesh molecule potential molecularMeasurements coalCombustion dsmc lagrangianIntermediate solidParticle lagrangianBasic dieselSpray edgeMesh coupledLduMatrix compressibleLESModels compressibleTurbulenceModel compressibleRASModels incompressibleLESModels incompressibleTurbulenceModel incompressibleRASModels LESfilters LESdeltas tetFiniteElement finiteArea errorEstimation randomProcesses decompositionMethods conversion surfMesh incompressibleTransportModels interfaceProperties viscoelasticTransportModels multiSolverLib OSspecific equationReader POD solidModels ODE engine lduSolvers blockMeshLib cfMesh extrudeModel autoMesh IOFunctionObjects systemCall utilityFunctionObjects fieldFunctionObjects forces checkFunctionObjects postCalc foamCalcFunctions finiteVolume sampling meshTools topoChangerFvMesh dynamicMesh dynamicTopoFvMesh dynamicFvMesh solidBodyMotion RBFMotionSolver fvMotionSolver tetMotionSolver laminarFlameSpeedModels liquidMixture radiation barotropicCompressibilityModel specie solids thermophysicalFunctions liquids basicThermophysicalModels pdf reactionThermophysicalModels solidMixture chemistryModel userd-newFoam userd-foam)
-  list(APPEND _expectedTargets ${_expectedTarget})
-  if(NOT TARGET ${_expectedTarget})
-    list(APPEND _targetsNotDefined ${_expectedTarget})
-  endif()
-  if(TARGET ${_expectedTarget})
-    list(APPEND _targetsDefined ${_expectedTarget})
-  endif()
-endforeach()
-if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
-  set(CMAKE_IMPORT_FILE_VERSION)
-  cmake_policy(POP)
-  return()
-endif()
-if(NOT "${_targetsDefined}" STREQUAL "")
-  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n")
-endif()
-unset(_targetsDefined)
-unset(_targetsNotDefined)
-unset(_expectedTargets)
-
-
-# Create imported target foam
-add_library(foam SHARED IMPORTED)
-
-set_target_properties(foam PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/foam/lnInclude"
-)
-
-# Create imported target immersedBoundaryForceFunctionObject
-add_library(immersedBoundaryForceFunctionObject SHARED IMPORTED)
-
-set_target_properties(immersedBoundaryForceFunctionObject PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/immersedBoundary/immersedBoundaryForce/lnInclude"
-)
-
-# Create imported target immersedBoundary
-add_library(immersedBoundary SHARED IMPORTED)
-
-set_target_properties(immersedBoundary PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/immersedBoundary/immersedBoundary/lnInclude"
-)
-
-# Create imported target immersedBoundaryTurbulence
-add_library(immersedBoundaryTurbulence SHARED IMPORTED)
-
-set_target_properties(immersedBoundaryTurbulence PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/immersedBoundary/immersedBoundaryTurbulence/lnInclude"
-)
-
-# Create imported target immersedBoundaryDynamicFvMesh
-add_library(immersedBoundaryDynamicFvMesh SHARED IMPORTED)
-
-set_target_properties(immersedBoundaryDynamicFvMesh PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/immersedBoundary/immersedBoundaryDynamicMesh/lnInclude"
-)
-
-# Create imported target molecule
-add_library(molecule SHARED IMPORTED)
-
-set_target_properties(molecule PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/lagrangian/molecularDynamics/molecule/lnInclude"
-)
-
-# Create imported target potential
-add_library(potential SHARED IMPORTED)
-
-set_target_properties(potential PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/lagrangian/molecularDynamics/potential/lnInclude"
-)
-
-# Create imported target molecularMeasurements
-add_library(molecularMeasurements SHARED IMPORTED)
-
-set_target_properties(molecularMeasurements PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/lagrangian/molecularDynamics/molecularMeasurements/lnInclude"
-)
-
-# Create imported target coalCombustion
-add_library(coalCombustion SHARED IMPORTED)
-
-set_target_properties(coalCombustion PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/lagrangian/coalCombustion/lnInclude"
-)
-
-# Create imported target dsmc
-add_library(dsmc SHARED IMPORTED)
-
-set_target_properties(dsmc PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/lagrangian/dsmc/lnInclude"
-)
-
-# Create imported target lagrangianIntermediate
-add_library(lagrangianIntermediate SHARED IMPORTED)
-
-set_target_properties(lagrangianIntermediate PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/lagrangian/intermediate/lnInclude"
-)
-
-# Create imported target solidParticle
-add_library(solidParticle SHARED IMPORTED)
-
-set_target_properties(solidParticle PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/lagrangian/solidParticle/lnInclude"
-)
-
-# Create imported target lagrangianBasic
-add_library(lagrangianBasic SHARED IMPORTED)
-
-set_target_properties(lagrangianBasic PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/lagrangian/basic/lnInclude"
-)
-
-# Create imported target dieselSpray
-add_library(dieselSpray SHARED IMPORTED)
-
-set_target_properties(dieselSpray PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/lagrangian/dieselSpray/lnInclude"
-)
-
-# Create imported target edgeMesh
-add_library(edgeMesh SHARED IMPORTED)
-
-set_target_properties(edgeMesh PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/edgeMesh/lnInclude"
-)
-
-# Create imported target coupledLduMatrix
-add_library(coupledLduMatrix SHARED IMPORTED)
-
-set_target_properties(coupledLduMatrix PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/coupledMatrix/lnInclude"
-)
-
-# Create imported target compressibleLESModels
-add_library(compressibleLESModels SHARED IMPORTED)
-
-set_target_properties(compressibleLESModels PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/turbulenceModels/compressible/LES/lnInclude"
-)
-
-# Create imported target compressibleTurbulenceModel
-add_library(compressibleTurbulenceModel SHARED IMPORTED)
-
-set_target_properties(compressibleTurbulenceModel PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/turbulenceModels/compressible/turbulenceModel/lnInclude;/home/henrus/OpenFOAM/foam-extend-4.0_2/src/turbulenceModels/compressible/turbulenceModel/../.."
-)
-
-# Create imported target compressibleRASModels
-add_library(compressibleRASModels SHARED IMPORTED)
-
-set_target_properties(compressibleRASModels PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/turbulenceModels/compressible/RAS/lnInclude;/home/henrus/OpenFOAM/foam-extend-4.0_2/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions"
-)
-
-# Create imported target incompressibleLESModels
-add_library(incompressibleLESModels SHARED IMPORTED)
-
-set_target_properties(incompressibleLESModels PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/turbulenceModels/incompressible/LES/lnInclude"
-)
-
-# Create imported target incompressibleTurbulenceModel
-add_library(incompressibleTurbulenceModel SHARED IMPORTED)
-
-set_target_properties(incompressibleTurbulenceModel PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/turbulenceModels/incompressible/turbulenceModel/lnInclude;/home/henrus/OpenFOAM/foam-extend-4.0_2/src/turbulenceModels/incompressible/turbulenceModel/../.."
-)
-
-# Create imported target incompressibleRASModels
-add_library(incompressibleRASModels SHARED IMPORTED)
-
-set_target_properties(incompressibleRASModels PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/turbulenceModels/incompressible/RAS/lnInclude;/home/henrus/OpenFOAM/foam-extend-4.0_2/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions"
-)
-
-# Create imported target LESfilters
-add_library(LESfilters SHARED IMPORTED)
-
-set_target_properties(LESfilters PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/turbulenceModels/LES/LESfilters/lnInclude"
-)
-
-# Create imported target LESdeltas
-add_library(LESdeltas SHARED IMPORTED)
-
-set_target_properties(LESdeltas PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/turbulenceModels/LES/LESdeltas/lnInclude"
-)
-
-# Create imported target tetFiniteElement
-add_library(tetFiniteElement SHARED IMPORTED)
-
-set_target_properties(tetFiniteElement PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/tetFiniteElement/lnInclude"
-)
-
-# Create imported target finiteArea
-add_library(finiteArea SHARED IMPORTED)
-
-set_target_properties(finiteArea PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/finiteArea/lnInclude"
-)
-
-# Create imported target errorEstimation
-add_library(errorEstimation SHARED IMPORTED)
-
-set_target_properties(errorEstimation PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/errorEstimation/lnInclude"
-)
-
-# Create imported target randomProcesses
-add_library(randomProcesses SHARED IMPORTED)
-
-set_target_properties(randomProcesses PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/randomProcesses/lnInclude"
-)
-
-# Create imported target decompositionMethods
-add_library(decompositionMethods SHARED IMPORTED)
-
-set_target_properties(decompositionMethods PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/decompositionMethods/decompositionMethods/lnInclude"
-)
-
-# Create imported target conversion
-add_library(conversion SHARED IMPORTED)
-
-set_target_properties(conversion PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/conversion/lnInclude"
-)
-
-# Create imported target surfMesh
-add_library(surfMesh SHARED IMPORTED)
-
-set_target_properties(surfMesh PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/surfMesh/lnInclude"
-)
-
-# Create imported target incompressibleTransportModels
-add_library(incompressibleTransportModels SHARED IMPORTED)
-
-set_target_properties(incompressibleTransportModels PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/transportModels/incompressible/lnInclude;/home/henrus/OpenFOAM/foam-extend-4.0_2/src/transportModels/incompressible/.."
-)
-
-# Create imported target interfaceProperties
-add_library(interfaceProperties SHARED IMPORTED)
-
-set_target_properties(interfaceProperties PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/transportModels/interfaceProperties/lnInclude"
-)
-
-# Create imported target viscoelasticTransportModels
-add_library(viscoelasticTransportModels SHARED IMPORTED)
-
-set_target_properties(viscoelasticTransportModels PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/transportModels/viscoelastic/lnInclude"
-)
-
-# Create imported target multiSolverLib
-add_library(multiSolverLib SHARED IMPORTED)
-
-set_target_properties(multiSolverLib PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/multiSolver/lnInclude"
-)
-
-# Create imported target OSspecific
-add_library(OSspecific SHARED IMPORTED)
-
-set_target_properties(OSspecific PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_COMPILE_DEFINITIONS "WM_SP;NoRepository"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/OSspecific/POSIX/lnInclude"
-)
-
-# Create imported target equationReader
-add_library(equationReader SHARED IMPORTED)
-
-set_target_properties(equationReader PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/equationReader/lnInclude"
-)
-
-# Create imported target POD
-add_library(POD SHARED IMPORTED)
-
-set_target_properties(POD PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/POD/lnInclude"
-)
-
-# Create imported target solidModels
-add_library(solidModels SHARED IMPORTED)
-
-set_target_properties(solidModels PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/solidModels/lnInclude"
-)
-
-# Create imported target ODE
-add_library(ODE SHARED IMPORTED)
-
-set_target_properties(ODE PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/ODE/lnInclude"
-)
-
-# Create imported target engine
-add_library(engine SHARED IMPORTED)
-
-set_target_properties(engine PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/engine/lnInclude"
-)
-
-# Create imported target lduSolvers
-add_library(lduSolvers SHARED IMPORTED)
-
-set_target_properties(lduSolvers PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/lduSolvers/lnInclude"
-)
-
-# Create imported target blockMeshLib
-add_library(blockMeshLib SHARED IMPORTED)
-
-set_target_properties(blockMeshLib PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/mesh/blockMesh/lnInclude"
-)
-
-# Create imported target cfMesh
-add_library(cfMesh SHARED IMPORTED)
-
-set_target_properties(cfMesh PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/mesh/cfMesh/lnInclude"
-)
-
-# Create imported target extrudeModel
-add_library(extrudeModel SHARED IMPORTED)
-
-set_target_properties(extrudeModel PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/mesh/extrudeModel/lnInclude"
-)
-
-# Create imported target autoMesh
-add_library(autoMesh SHARED IMPORTED)
-
-set_target_properties(autoMesh PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/mesh/autoMesh/lnInclude"
-)
-
-# Create imported target IOFunctionObjects
-add_library(IOFunctionObjects SHARED IMPORTED)
-
-set_target_properties(IOFunctionObjects PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/postProcessing/functionObjects/IO/lnInclude"
-)
-
-# Create imported target systemCall
-add_library(systemCall SHARED IMPORTED)
-
-set_target_properties(systemCall PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/postProcessing/functionObjects/systemCall/lnInclude"
-)
-
-# Create imported target utilityFunctionObjects
-add_library(utilityFunctionObjects SHARED IMPORTED)
-
-set_target_properties(utilityFunctionObjects PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/postProcessing/functionObjects/utilities/lnInclude"
-)
-
-# Create imported target fieldFunctionObjects
-add_library(fieldFunctionObjects SHARED IMPORTED)
-
-set_target_properties(fieldFunctionObjects PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/postProcessing/functionObjects/field/lnInclude"
-)
-
-# Create imported target forces
-add_library(forces SHARED IMPORTED)
-
-set_target_properties(forces PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/postProcessing/functionObjects/forces/lnInclude"
-)
-
-# Create imported target checkFunctionObjects
-add_library(checkFunctionObjects SHARED IMPORTED)
-
-set_target_properties(checkFunctionObjects PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/postProcessing/functionObjects/check/lnInclude"
-)
-
-# Create imported target postCalc
-add_library(postCalc SHARED IMPORTED)
-
-set_target_properties(postCalc PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/postProcessing/postCalc/lnInclude"
-)
-
-# Create imported target foamCalcFunctions
-add_library(foamCalcFunctions SHARED IMPORTED)
-
-set_target_properties(foamCalcFunctions PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/postProcessing/foamCalcFunctions/lnInclude"
-)
-
-# Create imported target finiteVolume
-add_library(finiteVolume SHARED IMPORTED)
-
-set_target_properties(finiteVolume PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/finiteVolume/lnInclude"
-)
-
-# Create imported target sampling
-add_library(sampling SHARED IMPORTED)
-
-set_target_properties(sampling PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/sampling/lnInclude"
-)
-
-# Create imported target meshTools
-add_library(meshTools SHARED IMPORTED)
-
-set_target_properties(meshTools PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/meshTools/lnInclude"
-)
-
-# Create imported target topoChangerFvMesh
-add_library(topoChangerFvMesh SHARED IMPORTED)
-
-set_target_properties(topoChangerFvMesh PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/dynamicMesh/topoChangerFvMesh/lnInclude"
-)
-
-# Create imported target dynamicMesh
-add_library(dynamicMesh SHARED IMPORTED)
-
-set_target_properties(dynamicMesh PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/dynamicMesh/dynamicMesh/lnInclude"
-)
-
-# Create imported target dynamicTopoFvMesh
-add_library(dynamicTopoFvMesh SHARED IMPORTED)
-
-set_target_properties(dynamicTopoFvMesh PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/dynamicMesh/dynamicTopoFvMesh/lnInclude"
-)
-
-# Create imported target dynamicFvMesh
-add_library(dynamicFvMesh SHARED IMPORTED)
-
-set_target_properties(dynamicFvMesh PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/dynamicMesh/dynamicFvMesh/lnInclude"
-)
-
-# Create imported target solidBodyMotion
-add_library(solidBodyMotion SHARED IMPORTED)
-
-set_target_properties(solidBodyMotion PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/dynamicMesh/meshMotion/solidBodyMotion/lnInclude"
-)
-
-# Create imported target RBFMotionSolver
-add_library(RBFMotionSolver SHARED IMPORTED)
-
-set_target_properties(RBFMotionSolver PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/dynamicMesh/meshMotion/RBFMotionSolver/lnInclude"
-)
-
-# Create imported target fvMotionSolver
-add_library(fvMotionSolver SHARED IMPORTED)
-
-set_target_properties(fvMotionSolver PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/dynamicMesh/meshMotion/fvMotionSolver/lnInclude"
-)
-
-# Create imported target tetMotionSolver
-add_library(tetMotionSolver SHARED IMPORTED)
-
-set_target_properties(tetMotionSolver PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/dynamicMesh/meshMotion/tetMotionSolver/lnInclude"
-)
-
-# Create imported target laminarFlameSpeedModels
-add_library(laminarFlameSpeedModels SHARED IMPORTED)
-
-set_target_properties(laminarFlameSpeedModels PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/thermophysicalModels/laminarFlameSpeed/lnInclude"
-)
-
-# Create imported target liquidMixture
-add_library(liquidMixture SHARED IMPORTED)
-
-set_target_properties(liquidMixture PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/thermophysicalModels/liquidMixture/lnInclude"
-)
-
-# Create imported target radiation
-add_library(radiation SHARED IMPORTED)
-
-set_target_properties(radiation PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/thermophysicalModels/radiation/lnInclude"
-)
-
-# Create imported target barotropicCompressibilityModel
-add_library(barotropicCompressibilityModel SHARED IMPORTED)
-
-set_target_properties(barotropicCompressibilityModel PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/thermophysicalModels/barotropicCompressibilityModel/lnInclude"
-)
-
-# Create imported target specie
-add_library(specie SHARED IMPORTED)
-
-set_target_properties(specie PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/thermophysicalModels/specie/lnInclude"
-)
-
-# Create imported target solids
-add_library(solids SHARED IMPORTED)
-
-set_target_properties(solids PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/thermophysicalModels/solids/lnInclude"
-)
-
-# Create imported target thermophysicalFunctions
-add_library(thermophysicalFunctions SHARED IMPORTED)
-
-set_target_properties(thermophysicalFunctions PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/thermophysicalModels/thermophysicalFunctions/lnInclude"
-)
-
-# Create imported target liquids
-add_library(liquids SHARED IMPORTED)
-
-set_target_properties(liquids PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/thermophysicalModels/liquids/lnInclude"
-)
-
-# Create imported target basicThermophysicalModels
-add_library(basicThermophysicalModels SHARED IMPORTED)
-
-set_target_properties(basicThermophysicalModels PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/thermophysicalModels/basic/lnInclude"
-)
-
-# Create imported target pdf
-add_library(pdf SHARED IMPORTED)
-
-set_target_properties(pdf PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/thermophysicalModels/pdfs/lnInclude"
-)
-
-# Create imported target reactionThermophysicalModels
-add_library(reactionThermophysicalModels SHARED IMPORTED)
-
-set_target_properties(reactionThermophysicalModels PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/thermophysicalModels/reactionThermo/lnInclude"
-)
-
-# Create imported target solidMixture
-add_library(solidMixture SHARED IMPORTED)
-
-set_target_properties(solidMixture PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/thermophysicalModels/solidMixture/lnInclude"
-)
-
-# Create imported target chemistryModel
-add_library(chemistryModel SHARED IMPORTED)
-
-set_target_properties(chemistryModel PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/src/thermophysicalModels/chemistryModel/lnInclude"
-)
-
-# Create imported target userd-newFoam
-add_library(userd-newFoam SHARED IMPORTED)
-
-set_target_properties(userd-newFoam PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/applications/utilities/postProcessing/graphics/newEnsightFoamReader/lnInclude"
-)
-
-# Create imported target userd-foam
-add_library(userd-foam SHARED IMPORTED)
-
-set_target_properties(userd-foam PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "FOAM_MAJOR_VERSION"
-  INTERFACE_FOAM_MAJOR_VERSION "4"
-  INTERFACE_INCLUDE_DIRECTORIES "/home/henrus/OpenFOAM/foam-extend-4.0_2/applications/utilities/postProcessing/graphics/ensightFoamReader/lnInclude"
-)
-
-# Import target "foam" for configuration ""
-set_property(TARGET foam APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(foam PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "OSspecific;mpi;ZLIB::ZLIB"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libfoam.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libfoam.so.3"
-  )
-
-# Import target "immersedBoundaryForceFunctionObject" for configuration ""
-set_property(TARGET immersedBoundaryForceFunctionObject APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(immersedBoundaryForceFunctionObject PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "immersedBoundaryTurbulence;forces"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libimmersedBoundaryForceFunctionObject.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libimmersedBoundaryForceFunctionObject.so.3"
-  )
-
-# Import target "immersedBoundary" for configuration ""
-set_property(TARGET immersedBoundary APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(immersedBoundary PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume;sampling;surfMesh;dynamicMesh"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libimmersedBoundary.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libimmersedBoundary.so.3"
-  )
-
-# Import target "immersedBoundaryTurbulence" for configuration ""
-set_property(TARGET immersedBoundaryTurbulence APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(immersedBoundaryTurbulence PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "immersedBoundary;incompressibleRASModels;incompressibleLESModels"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libimmersedBoundaryTurbulence.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libimmersedBoundaryTurbulence.so.3"
-  )
-
-# Import target "immersedBoundaryDynamicFvMesh" for configuration ""
-set_property(TARGET immersedBoundaryDynamicFvMesh APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(immersedBoundaryDynamicFvMesh PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "immersedBoundary;dynamicFvMesh;solidBodyMotion"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libimmersedBoundaryDynamicFvMesh.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libimmersedBoundaryDynamicFvMesh.so.3"
-  )
-
-# Import target "molecule" for configuration ""
-set_property(TARGET molecule APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(molecule PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "potential"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libmolecule.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libmolecule.so.3"
-  )
-
-# Import target "potential" for configuration ""
-set_property(TARGET potential APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(potential PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libpotential.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libpotential.so.3"
-  )
-
-# Import target "molecularMeasurements" for configuration ""
-set_property(TARGET molecularMeasurements APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(molecularMeasurements PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "foam"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libmolecularMeasurements.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libmolecularMeasurements.so.3"
-  )
-
-# Import target "coalCombustion" for configuration ""
-set_property(TARGET coalCombustion APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(coalCombustion PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "lagrangianBasic;lagrangianIntermediate;basicThermophysicalModels"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libcoalCombustion.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libcoalCombustion.so.3"
-  )
-
-# Import target "dsmc" for configuration ""
-set_property(TARGET dsmc APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(dsmc PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume;lagrangianBasic"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libdsmc.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libdsmc.so.3"
-  )
-
-# Import target "lagrangianIntermediate" for configuration ""
-set_property(TARGET lagrangianIntermediate APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(lagrangianIntermediate PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "reactionThermophysicalModels;radiation;compressibleRASModels;compressibleLESModels;pdf;liquidMixture;solidMixture"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/liblagrangianIntermediate.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "liblagrangianIntermediate.so.3"
-  )
-
-# Import target "solidParticle" for configuration ""
-set_property(TARGET solidParticle APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(solidParticle PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume;lagrangianBasic"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libsolidParticle.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libsolidParticle.so.3"
-  )
-
-# Import target "lagrangianBasic" for configuration ""
-set_property(TARGET lagrangianBasic APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(lagrangianBasic PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "decompositionMethods;foam"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/liblagrangianBasic.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "liblagrangianBasic.so.3"
-  )
-
-# Import target "dieselSpray" for configuration ""
-set_property(TARGET dieselSpray APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(dieselSpray PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "lagrangianBasic;lagrangianIntermediate;basicThermophysicalModels"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libdieselSpray.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libdieselSpray.so.3"
-  )
-
-# Import target "edgeMesh" for configuration ""
-set_property(TARGET edgeMesh APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(edgeMesh PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "foam"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libedgeMesh.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libedgeMesh.so.3"
-  )
-
-# Import target "coupledLduMatrix" for configuration ""
-set_property(TARGET coupledLduMatrix APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(coupledLduMatrix PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libcoupledLduMatrix.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libcoupledLduMatrix.so.3"
-  )
-
-# Import target "compressibleLESModels" for configuration ""
-set_property(TARGET compressibleLESModels APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(compressibleLESModels PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "compressibleTurbulenceModel;LESdeltas;LESfilters"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libcompressibleLESModels.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libcompressibleLESModels.so.3"
-  )
-
-# Import target "compressibleTurbulenceModel" for configuration ""
-set_property(TARGET compressibleTurbulenceModel APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(compressibleTurbulenceModel PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "basicThermophysicalModels"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libcompressibleTurbulenceModel.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libcompressibleTurbulenceModel.so.3"
-  )
-
-# Import target "compressibleRASModels" for configuration ""
-set_property(TARGET compressibleRASModels APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(compressibleRASModels PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "compressibleTurbulenceModel"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libcompressibleRASModels.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libcompressibleRASModels.so.3"
-  )
-
-# Import target "incompressibleLESModels" for configuration ""
-set_property(TARGET incompressibleLESModels APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(incompressibleLESModels PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "incompressibleTurbulenceModel;LESdeltas;LESfilters"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libincompressibleLESModels.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libincompressibleLESModels.so.3"
-  )
-
-# Import target "incompressibleTurbulenceModel" for configuration ""
-set_property(TARGET incompressibleTurbulenceModel APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(incompressibleTurbulenceModel PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "incompressibleTransportModels"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libincompressibleTurbulenceModel.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libincompressibleTurbulenceModel.so.3"
-  )
-
-# Import target "incompressibleRASModels" for configuration ""
-set_property(TARGET incompressibleRASModels APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(incompressibleRASModels PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "incompressibleTurbulenceModel"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libincompressibleRASModels.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libincompressibleRASModels.so.3"
-  )
-
-# Import target "LESfilters" for configuration ""
-set_property(TARGET LESfilters APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(LESfilters PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libLESfilters.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libLESfilters.so.3"
-  )
-
-# Import target "LESdeltas" for configuration ""
-set_property(TARGET LESdeltas APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(LESdeltas PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libLESdeltas.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libLESdeltas.so.3"
-  )
-
-# Import target "tetFiniteElement" for configuration ""
-set_property(TARGET tetFiniteElement APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(tetFiniteElement PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "meshTools"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libtetFiniteElement.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libtetFiniteElement.so.3"
-  )
-
-# Import target "finiteArea" for configuration ""
-set_property(TARGET finiteArea APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(finiteArea PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "foam"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libfiniteArea.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libfiniteArea.so.3"
-  )
-
-# Import target "errorEstimation" for configuration ""
-set_property(TARGET errorEstimation APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(errorEstimation PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/liberrorEstimation.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "liberrorEstimation.so.3"
-  )
-
-# Import target "randomProcesses" for configuration ""
-set_property(TARGET randomProcesses APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(randomProcesses PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/librandomProcesses.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "librandomProcesses.so.3"
-  )
-
-# Import target "decompositionMethods" for configuration ""
-set_property(TARGET decompositionMethods APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(decompositionMethods PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "foam"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libdecompositionMethods.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libdecompositionMethods.so.3"
-  )
-
-# Import target "conversion" for configuration ""
-set_property(TARGET conversion APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(conversion PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libconversion.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libconversion.so.3"
-  )
-
-# Import target "surfMesh" for configuration ""
-set_property(TARGET surfMesh APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(surfMesh PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "foam"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libsurfMesh.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libsurfMesh.so.3"
-  )
-
-# Import target "incompressibleTransportModels" for configuration ""
-set_property(TARGET incompressibleTransportModels APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(incompressibleTransportModels PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libincompressibleTransportModels.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libincompressibleTransportModels.so.3"
-  )
-
-# Import target "interfaceProperties" for configuration ""
-set_property(TARGET interfaceProperties APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(interfaceProperties PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libinterfaceProperties.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libinterfaceProperties.so.3"
-  )
-
-# Import target "viscoelasticTransportModels" for configuration ""
-set_property(TARGET viscoelasticTransportModels APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(viscoelasticTransportModels PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libviscoelasticTransportModels.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libviscoelasticTransportModels.so.3"
-  )
-
-# Import target "multiSolverLib" for configuration ""
-set_property(TARGET multiSolverLib APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(multiSolverLib PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "foam"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libmultiSolverLib.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libmultiSolverLib.so.3"
-  )
-
-# Import target "OSspecific" for configuration ""
-set_property(TARGET OSspecific APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(OSspecific PROPERTIES
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libOSspecific.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libOSspecific.so.3"
-  )
-
-# Import target "equationReader" for configuration ""
-set_property(TARGET equationReader APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(equationReader PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "foam"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libequationReader.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libequationReader.so.3"
-  )
-
-# Import target "POD" for configuration ""
-set_property(TARGET POD APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(POD PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume;ODE"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libPOD.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libPOD.so.3"
-  )
-
-# Import target "solidModels" for configuration ""
-set_property(TARGET solidModels APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(solidModels PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "topoChangerFvMesh;finiteArea"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libsolidModels.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libsolidModels.so.3"
-  )
-
-# Import target "ODE" for configuration ""
-set_property(TARGET ODE APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(ODE PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "meshTools"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libODE.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libODE.so.3"
-  )
-
-# Import target "engine" for configuration ""
-set_property(TARGET engine APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(engine PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "dynamicFvMesh;fvMotionSolver"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libengine.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libengine.so.3"
-  )
-
-# Import target "lduSolvers" for configuration ""
-set_property(TARGET lduSolvers APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(lduSolvers PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "foam"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/liblduSolvers.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "liblduSolvers.so.3"
-  )
-
-# Import target "blockMeshLib" for configuration ""
-set_property(TARGET blockMeshLib APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(blockMeshLib PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "ODE;dynamicMesh;finiteVolume;meshTools"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libblockMeshLib.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libblockMeshLib.so.3"
-  )
-
-# Import target "cfMesh" for configuration ""
-set_property(TARGET cfMesh APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(cfMesh PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "meshTools;edgeMesh"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libcfMesh.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libcfMesh.so.3"
-  )
-
-# Import target "extrudeModel" for configuration ""
-set_property(TARGET extrudeModel APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(extrudeModel PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "dynamicMesh"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libextrudeModel.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libextrudeModel.so.3"
-  )
-
-# Import target "autoMesh" for configuration ""
-set_property(TARGET autoMesh APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(autoMesh PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "dynamicFvMesh;edgeMesh"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libautoMesh.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libautoMesh.so.3"
-  )
-
-# Import target "IOFunctionObjects" for configuration ""
-set_property(TARGET IOFunctionObjects APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(IOFunctionObjects PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "foam"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libIOFunctionObjects.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libIOFunctionObjects.so.3"
-  )
-
-# Import target "systemCall" for configuration ""
-set_property(TARGET systemCall APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(systemCall PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "foam"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libsystemCall.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libsystemCall.so.3"
-  )
-
-# Import target "utilityFunctionObjects" for configuration ""
-set_property(TARGET utilityFunctionObjects APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(utilityFunctionObjects PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "basicThermophysicalModels;sampling;dsmc"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libutilityFunctionObjects.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libutilityFunctionObjects.so.3"
-  )
-
-# Import target "fieldFunctionObjects" for configuration ""
-set_property(TARGET fieldFunctionObjects APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(fieldFunctionObjects PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libfieldFunctionObjects.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libfieldFunctionObjects.so.3"
-  )
-
-# Import target "forces" for configuration ""
-set_property(TARGET forces APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(forces PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "incompressibleRASModels;incompressibleLESModels;compressibleRASModels;compressibleLESModels"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libforces.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libforces.so.3"
-  )
-
-# Import target "checkFunctionObjects" for configuration ""
-set_property(TARGET checkFunctionObjects APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(checkFunctionObjects PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libcheckFunctionObjects.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libcheckFunctionObjects.so.3"
-  )
-
-# Import target "postCalc" for configuration ""
-set_property(TARGET postCalc APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(postCalc PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libpostCalc.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libpostCalc.so.3"
-  )
-
-# Import target "foamCalcFunctions" for configuration ""
-set_property(TARGET foamCalcFunctions APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(foamCalcFunctions PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libfoamCalcFunctions.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libfoamCalcFunctions.so.3"
-  )
-
-# Import target "finiteVolume" for configuration ""
-set_property(TARGET finiteVolume APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(finiteVolume PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "meshTools"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libfiniteVolume.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libfiniteVolume.so.3"
-  )
-
-# Import target "sampling" for configuration ""
-set_property(TARGET sampling APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(sampling PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume;surfMesh"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libsampling.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libsampling.so.3"
-  )
-
-# Import target "meshTools" for configuration ""
-set_property(TARGET meshTools APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(meshTools PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "lagrangianBasic;decompositionMethods"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libmeshTools.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libmeshTools.so.3"
-  )
-
-# Import target "topoChangerFvMesh" for configuration ""
-set_property(TARGET topoChangerFvMesh APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(topoChangerFvMesh PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "dynamicFvMesh"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libtopoChangerFvMesh.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libtopoChangerFvMesh.so.3"
-  )
-
-# Import target "dynamicMesh" for configuration ""
-set_property(TARGET dynamicMesh APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(dynamicMesh PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "meshTools"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libdynamicMesh.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libdynamicMesh.so.3"
-  )
-
-# Import target "dynamicTopoFvMesh" for configuration ""
-set_property(TARGET dynamicTopoFvMesh APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(dynamicTopoFvMesh PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "dynamicFvMesh"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libdynamicTopoFvMesh.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libdynamicTopoFvMesh.so.3"
-  )
-
-# Import target "dynamicFvMesh" for configuration ""
-set_property(TARGET dynamicFvMesh APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(dynamicFvMesh PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "dynamicMesh;finiteVolume;RBFMotionSolver;solidBodyMotion;tetMotionSolver"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libdynamicFvMesh.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libdynamicFvMesh.so.3"
-  )
-
-# Import target "solidBodyMotion" for configuration ""
-set_property(TARGET solidBodyMotion APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(solidBodyMotion PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "foam"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libsolidBodyMotion.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libsolidBodyMotion.so.3"
-  )
-
-# Import target "RBFMotionSolver" for configuration ""
-set_property(TARGET RBFMotionSolver APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(RBFMotionSolver PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "dynamicMesh"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libRBFMotionSolver.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libRBFMotionSolver.so.3"
-  )
-
-# Import target "fvMotionSolver" for configuration ""
-set_property(TARGET fvMotionSolver APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(fvMotionSolver PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume;dynamicMesh"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libfvMotionSolver.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libfvMotionSolver.so.3"
-  )
-
-# Import target "tetMotionSolver" for configuration ""
-set_property(TARGET tetMotionSolver APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(tetMotionSolver PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "tetFiniteElement;dynamicMesh"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libtetMotionSolver.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libtetMotionSolver.so.3"
-  )
-
-# Import target "laminarFlameSpeedModels" for configuration ""
-set_property(TARGET laminarFlameSpeedModels APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(laminarFlameSpeedModels PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "reactionThermophysicalModels"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/liblaminarFlameSpeedModels.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "liblaminarFlameSpeedModels.so.3"
-  )
-
-# Import target "liquidMixture" for configuration ""
-set_property(TARGET liquidMixture APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(liquidMixture PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "liquids;specie"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libliquidMixture.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libliquidMixture.so.3"
-  )
-
-# Import target "radiation" for configuration ""
-set_property(TARGET radiation APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(radiation PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "basicThermophysicalModels"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libradiation.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libradiation.so.3"
-  )
-
-# Import target "barotropicCompressibilityModel" for configuration ""
-set_property(TARGET barotropicCompressibilityModel APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(barotropicCompressibilityModel PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libbarotropicCompressibilityModel.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libbarotropicCompressibilityModel.so.3"
-  )
-
-# Import target "specie" for configuration ""
-set_property(TARGET specie APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(specie PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "foam"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libspecie.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libspecie.so.3"
-  )
-
-# Import target "solids" for configuration ""
-set_property(TARGET solids APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(solids PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "foam"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libsolids.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libsolids.so.3"
-  )
-
-# Import target "thermophysicalFunctions" for configuration ""
-set_property(TARGET thermophysicalFunctions APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(thermophysicalFunctions PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "foam"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libthermophysicalFunctions.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libthermophysicalFunctions.so.3"
-  )
-
-# Import target "liquids" for configuration ""
-set_property(TARGET liquids APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(liquids PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "thermophysicalFunctions"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libliquids.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libliquids.so.3"
-  )
-
-# Import target "basicThermophysicalModels" for configuration ""
-set_property(TARGET basicThermophysicalModels APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(basicThermophysicalModels PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume;specie;thermophysicalFunctions"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libbasicThermophysicalModels.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libbasicThermophysicalModels.so.3"
-  )
-
-# Import target "pdf" for configuration ""
-set_property(TARGET pdf APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(pdf PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "foam"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libpdf.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libpdf.so.3"
-  )
-
-# Import target "reactionThermophysicalModels" for configuration ""
-set_property(TARGET reactionThermophysicalModels APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(reactionThermophysicalModels PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "basicThermophysicalModels"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libreactionThermophysicalModels.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libreactionThermophysicalModels.so.3"
-  )
-
-# Import target "solidMixture" for configuration ""
-set_property(TARGET solidMixture APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(solidMixture PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "solids"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libsolidMixture.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libsolidMixture.so.3"
-  )
-
-# Import target "chemistryModel" for configuration ""
-set_property(TARGET chemistryModel APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(chemistryModel PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "reactionThermophysicalModels;ODE"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libchemistryModel.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libchemistryModel.so.3"
-  )
-
-# Import target "userd-newFoam" for configuration ""
-set_property(TARGET userd-newFoam APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(userd-newFoam PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume;finiteArea;lagrangianBasic"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libuserd-newFoam.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libuserd-newFoam.so.3"
-  )
-
-# Import target "userd-foam" for configuration ""
-set_property(TARGET userd-foam APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-set_target_properties(userd-foam PROPERTIES
-  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "finiteVolume;lagrangianBasic"
-  IMPORTED_LOCATION_NOCONFIG "/home/henrus/OpenFOAM/foam-extend-4.0_2/lib/libuserd-foam.so.4.0"
-  IMPORTED_SONAME_NOCONFIG "libuserd-foam.so.3"
-  )
-
-# This file does not depend on other imported targets which have
-# been exported from the same project but in a separate export set.
-
-# Commands beyond this point should not need to know the version.
-set(CMAKE_IMPORT_FILE_VERSION)
-cmake_policy(POP)
diff --git a/cmake/getGitVersion.cmake b/cmake/getGitVersion.cmake
index ad9d53b05..216adcf48 100644
--- a/cmake/getGitVersion.cmake
+++ b/cmake/getGitVersion.cmake
@@ -1,3 +1,34 @@
+# --------------------------------------------------------------------------
+#   ========                 |
+#   \      /  F ield         | foam-extend: Open Source CFD
+#    \    /   O peration     | Version:     4.1
+#     \  /    A nd           | Web:         http://www.foam-extend.org
+#      \/     M anipulation  | For copyright notice see file Copyright
+# --------------------------------------------------------------------------
+# License
+#     This file is part of foam-extend.
+#
+#     foam-extend is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation, either version 3 of the License, or {at your
+#     option} any later version.
+#
+#     foam-extend is distributed in the hope that it will be useful, but
+#     WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#     General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Description
+#     CMakeLists.txt file for libraries and applications
+#
+# Author
+#     Henrik Rusche, Wikki GmbH, 2017. All rights reserved
+#
+#
+# --------------------------------------------------------------------------
 
 if(NOT GIT_FOUND)
   find_package(Git QUIET)
@@ -37,7 +68,7 @@ configure_file(cmake/storedVersion.cmake.in
 )
 
 # Configure global.C
-configure_file(src/foam/global/global.C.in
+configure_file(${CMAKE_SOURCE_DIR}/src/foam/global/global.C.in
   src/foam/global/global.C
 )
 
diff --git a/cmake/storedVersion.cmake b/cmake/storedVersion.cmake
deleted file mode 100644
index dab22f1ec..000000000
--- a/cmake/storedVersion.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-set(GIT_VERSION "v4.0-dirty")
-set(FOAM_VERSION "4.0")
diff --git a/src/ODE/CMakeLists.txt b/src/ODE/CMakeLists.txt
index 65c1d981e..6c5e809df 100644
--- a/src/ODE/CMakeLists.txt
+++ b/src/ODE/CMakeLists.txt
@@ -31,7 +31,7 @@
 # --------------------------------------------------------------------------
 
 set(ODESolvers ODESolvers)
-list(APPEND sources
+list(APPEND SOURCES
   ${ODESolvers}/ODESolver/ODESolver.C
   ${ODESolvers}/ODESolver/newODESolver.C
   ${ODESolvers}/Euler/Euler.C
@@ -43,19 +43,17 @@ list(APPEND sources
 )
 
 set(translationODE translationODE)
-list(APPEND sources
+list(APPEND SOURCES
   ${translationODE}/translationODE.C
 )
 
 set(sixDOF sixDOF)
-list(APPEND sources
+list(APPEND SOURCES
   ${sixDOF}/finiteRotation/finiteRotation.C
   ${sixDOF}/sixDOFqODE/sixDOFqODE.C
   ${sixDOF}/sixDOFbodies/sixDOFbodies.C
 )
 
-add_foam_library(ODE SHARED ${sources})
+add_foam_library(ODE SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(ODE PUBLIC meshTools)
diff --git a/src/OSspecific/MSWindows/CMakeLists.txt b/src/OSspecific/MSWindows/CMakeLists.txt
index 7da1f8fe8..87e2c8c5a 100644
--- a/src/OSspecific/MSWindows/CMakeLists.txt
+++ b/src/OSspecific/MSWindows/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   signals/sigFpe.C
   signals/sigSegv.C
   signals/sigInt.C
@@ -45,8 +45,6 @@ list(APPEND sources
   printStack.C
 )
 
-add_foam_library(OSspecific SHARED ${sources})
+add_foam_library(OSspecific SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(OSspecific finiteVolume)
diff --git a/src/OSspecific/POSIX/CMakeLists.txt b/src/OSspecific/POSIX/CMakeLists.txt
index 6fe7394ae..1033f3313 100644
--- a/src/OSspecific/POSIX/CMakeLists.txt
+++ b/src/OSspecific/POSIX/CMakeLists.txt
@@ -33,7 +33,7 @@
 get_property(inc TARGET foam PROPERTY INCLUDE_DIRECTORIES)
 include_directories(${inc})
 
-list(APPEND sources
+list(APPEND SOURCES
   signals/sigFpe.C
   signals/sigSegv.C
   signals/sigInt.C
@@ -48,17 +48,16 @@ list(APPEND sources
 )
 
 #ifdef SunOS64
-#list(APPEND sources
+#list(APPEND SOURCES
 #  dummyPrintStack.C
 #)
 #else
-list(APPEND sources
+list(APPEND SOURCES
   printStack.C
 )
 #endif
 
-add_foam_library(OSspecific SHARED ${sources})
+add_foam_library(OSspecific SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
-#target_link_libraries(OSspecific finiteVolume)
+target_link_libraries(OSspecific)
+add_dependencies(OSspecific foam_lnInclude)
diff --git a/src/POD/CMakeLists.txt b/src/POD/CMakeLists.txt
index 3c8570180..6b35ad4a5 100644
--- a/src/POD/CMakeLists.txt
+++ b/src/POD/CMakeLists.txt
@@ -30,15 +30,13 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   PODEigenBase/PODEigenBase.C
   PODOrthoNormalBase/scalarPODOrthoNormalBase.C
   PODODE/PODODE.C
   scalarTransportPOD/scalarTransportPOD.C
 )
 
-add_foam_library(POD SHARED ${sources})
+add_foam_library(POD SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(POD PUBLIC finiteVolume ODE)
diff --git a/src/conversion/CMakeLists.txt b/src/conversion/CMakeLists.txt
index 0113a52c8..511f5d895 100644
--- a/src/conversion/CMakeLists.txt
+++ b/src/conversion/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   ensight/file/ensightFile.C
   ensight/file/ensightGeoFile.C
   ensight/part/ensightPart.C
@@ -52,8 +52,6 @@ list(APPEND sources
   polyDualMesh/polyDualMesh.C
 )
 
-add_foam_library(conversion SHARED ${sources})
+add_foam_library(conversion SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(conversion PUBLIC finiteVolume)
diff --git a/src/coupledMatrix/CMakeLists.txt b/src/coupledMatrix/CMakeLists.txt
index b3bd1fbe5..061dea019 100644
--- a/src/coupledMatrix/CMakeLists.txt
+++ b/src/coupledMatrix/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   coupledLduMatrix/coupledLduMatrix.C
   coupledLduPrecon/coupledLduPrecon/coupledLduPrecon.C
   coupledLduPrecon/noPrecon/coupledNoPrecon.C
@@ -52,8 +52,6 @@ list(APPEND sources
   coupledFvMatrices/coupledFvScalarMatrix/coupledFvScalarMatrix.C
 )
 
-add_foam_library(coupledLduMatrix SHARED ${sources})
+add_foam_library(coupledLduMatrix SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(coupledLduMatrix finiteVolume)
diff --git a/src/cudaSolvers/CMakeLists.txt b/src/cudaSolvers/CMakeLists.txt
index 9ae9b2f39..c8042c2e0 100644
--- a/src/cudaSolvers/CMakeLists.txt
+++ b/src/cudaSolvers/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   cudaSolver/cudaSolver.C
   cudaCG/cgDiag.cu
   cudaCG/cgAmg.cu
@@ -41,8 +41,6 @@ list(APPEND sources
   cudaBiCGStab/cudaBiCGStab.C
 )
 
-add_foam_library(cudaSolvers SHARED ${sources})
+add_foam_library(cudaSolvers SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(cudaSolvers finiteVolume)
diff --git a/src/dbns/CMakeLists.txt b/src/dbns/CMakeLists.txt
index 1beae1630..0c38550fd 100644
--- a/src/dbns/CMakeLists.txt
+++ b/src/dbns/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   dbnsFlux/roeFlux/roeFlux.C
   dbnsFlux/rusanovFlux/rusanovFlux.C
   dbnsFlux/betaFlux/betaFlux.C
@@ -50,8 +50,6 @@ list(APPEND sources
   timeStepping/EulerLocalDdtScheme/EulerLocalDdtSchemes.C
 )
 
-add_foam_library(dbns SHARED ${sources})
+add_foam_library(dbns SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(dbns PUBLIC finiteVolume meshTools basicThermophysicalModels)
diff --git a/src/decompositionMethods/decompositionMethods/CMakeLists.txt b/src/decompositionMethods/decompositionMethods/CMakeLists.txt
index 7e6abb4ae..bb701ac55 100644
--- a/src/decompositionMethods/decompositionMethods/CMakeLists.txt
+++ b/src/decompositionMethods/decompositionMethods/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   decompositionMethod/decompositionMethod.C
   manualDecomp/manualDecomp.C
   geomDecomp/geomDecomp.C
@@ -39,8 +39,6 @@ list(APPEND sources
   patchConstrainedDecomp/patchConstrainedDecomp.C
 )
 
-add_foam_library(decompositionMethods SHARED ${sources})
+add_foam_library(decompositionMethods SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(decompositionMethods PUBLIC foam)
diff --git a/src/decompositionMethods/metisDecomp/CMakeLists.txt b/src/decompositionMethods/metisDecomp/CMakeLists.txt
index e6f16483e..1af0d996f 100644
--- a/src/decompositionMethods/metisDecomp/CMakeLists.txt
+++ b/src/decompositionMethods/metisDecomp/CMakeLists.txt
@@ -30,12 +30,10 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   metisDecomp.C
 )
 
-add_foam_library(metisDecomp SHARED ${sources})
+add_foam_library(metisDecomp SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(metisDecomp finiteVolume)
diff --git a/src/decompositionMethods/parMetisDecomp/CMakeLists.txt b/src/decompositionMethods/parMetisDecomp/CMakeLists.txt
index c06921b99..89614e5cb 100644
--- a/src/decompositionMethods/parMetisDecomp/CMakeLists.txt
+++ b/src/decompositionMethods/parMetisDecomp/CMakeLists.txt
@@ -30,12 +30,10 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   parMetisDecomp.C
 )
 
-add_foam_library(parMetisDecomp SHARED ${sources})
+add_foam_library(parMetisDecomp SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(parMetisDecomp finiteVolume)
diff --git a/src/decompositionMethods/scotchDecomp/CMakeLists.txt b/src/decompositionMethods/scotchDecomp/CMakeLists.txt
index 2451d9309..44e36f8a9 100644
--- a/src/decompositionMethods/scotchDecomp/CMakeLists.txt
+++ b/src/decompositionMethods/scotchDecomp/CMakeLists.txt
@@ -30,13 +30,11 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   scotchDecomp/scotchDecomp.C
   engineScotchDecomp/engineScotchDecomp.C
 )
 
-add_foam_library(scotchDecomp SHARED ${sources})
+add_foam_library(scotchDecomp SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(scotchDecomp finiteVolume)
diff --git a/src/dynamicMesh/dynamicFvMesh/CMakeLists.txt b/src/dynamicMesh/dynamicFvMesh/CMakeLists.txt
index 83dcab24b..fbeec613d 100644
--- a/src/dynamicMesh/dynamicFvMesh/CMakeLists.txt
+++ b/src/dynamicMesh/dynamicFvMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   dynamicFvMesh/dynamicFvMesh.C
   dynamicFvMesh/newDynamicFvMesh.C
   staticFvMesh/staticFvMesh.C
@@ -48,8 +48,6 @@ list(APPEND sources
   fvMeshDistribute/fvMeshDistribute.C
 )
 
-add_foam_library(dynamicFvMesh SHARED ${sources})
+add_foam_library(dynamicFvMesh SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(dynamicFvMesh PUBLIC dynamicMesh finiteVolume RBFMotionSolver solidBodyMotion tetMotionSolver)
diff --git a/src/dynamicMesh/dynamicMesh/CMakeLists.txt b/src/dynamicMesh/dynamicMesh/CMakeLists.txt
index 1bcd3b1bc..401fb4c6a 100644
--- a/src/dynamicMesh/dynamicMesh/CMakeLists.txt
+++ b/src/dynamicMesh/dynamicMesh/CMakeLists.txt
@@ -32,13 +32,13 @@
 
 set(polyMeshModifiers polyMeshModifiers)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${polyMeshModifiers}/polyMeshModifier/polyMeshModifier.C
   ${polyMeshModifiers}/polyMeshModifier/newPolyMeshModifier.C
 )
 
 set(attachDetach ${polyMeshModifiers}/attachDetach)
-list(APPEND sources
+list(APPEND SOURCES
   ${attachDetach}/attachDetach.C
   ${attachDetach}/attachInterface.C
   ${attachDetach}/detachInterface.C
@@ -46,7 +46,7 @@ list(APPEND sources
 )
 
 set(layerAdditionRemoval ${polyMeshModifiers}/layerAdditionRemoval)
-list(APPEND sources
+list(APPEND SOURCES
   ${layerAdditionRemoval}/layerAdditionRemoval.C
   ${layerAdditionRemoval}/setLayerPairing.C
   ${layerAdditionRemoval}/addCellLayer.C
@@ -57,7 +57,7 @@ list(APPEND sources
 
 set(slidingInterface ${polyMeshModifiers}/slidingInterface)
 set(enrichedPatch ${slidingInterface}/enrichedPatch)
-list(APPEND sources
+list(APPEND SOURCES
   ${enrichedPatch}/enrichedPatch.C
   ${enrichedPatch}/enrichedPatchPointMap.C
   ${enrichedPatch}/enrichedPatchFaces.C
@@ -73,7 +73,7 @@ list(APPEND sources
 )
 
 set(repatchCoverage ${polyMeshModifiers}/repatchCoverage)
-list(APPEND sources
+list(APPEND SOURCES
   ${repatchCoverage}/repatchCoverage.C
   polyTopoChange/polyTopoChange/polyTopoChange.C
   polyTopoChange/polyTopoChange/actions/topoAction/topoActions.C
@@ -90,7 +90,7 @@ list(APPEND sources
 )
 
 set(directActions directTopoChange/directTopoChange/directActions)
-list(APPEND sources
+list(APPEND SOURCES
   ${directActions}/addPatchCellLayer.C
   ${directActions}/edgeCollapser.C
   ${directActions}/faceCollapser.C
@@ -104,7 +104,7 @@ list(APPEND sources
 )
 
 set(meshCut directTopoChange/meshCut)
-list(APPEND sources
+list(APPEND SOURCES
   ${meshCut}/cellLooper/cellLooper.C
   ${meshCut}/cellLooper/topoCellLooper.C
   ${meshCut}/cellLooper/geomCellLooper.C
@@ -120,7 +120,7 @@ list(APPEND sources
 )
 
 set(modifiers ${meshCut}/modifiers)
-list(APPEND sources
+list(APPEND SOURCES
   ${modifiers}/boundaryCutter/boundaryCutter.C
   ${modifiers}/meshCutter/meshCutter.C
   ${modifiers}/meshCutAndRemove/meshCutAndRemove.C
@@ -135,8 +135,6 @@ list(APPEND sources
   directTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C
 )
 
-add_foam_library(dynamicMesh SHARED ${sources})
+add_foam_library(dynamicMesh SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(dynamicMesh PUBLIC meshTools)
diff --git a/src/dynamicMesh/dynamicTopoFvMesh/CMakeLists.txt b/src/dynamicMesh/dynamicTopoFvMesh/CMakeLists.txt
index cf58f1004..c66c437d3 100644
--- a/src/dynamicMesh/dynamicTopoFvMesh/CMakeLists.txt
+++ b/src/dynamicMesh/dynamicTopoFvMesh/CMakeLists.txt
@@ -30,14 +30,14 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   eMesh/eMesh.C
   eMesh/eMeshDemandDrivenData.C
   eMesh/eBoundaryMesh/eBoundaryMesh.C
 )
 
 set(ePatches eMesh/ePatches)
-list(APPEND sources
+list(APPEND SOURCES
   ${ePatches}/ePatch/ePatch.C
   ${ePatches}/ePatch/newEPatch.C
   dynamicTopoFvMesh.C
@@ -62,18 +62,16 @@ list(APPEND sources
 )
 
 set(tetMetrics tetMetrics)
-list(APPEND sources
+list(APPEND SOURCES
   ${tetMetrics}/tetMetric.C
   ${tetMetrics}/tetMetrics.C
 )
 
 set(lengthScaleEstimator lengthScaleEstimator)
-list(APPEND sources
+list(APPEND SOURCES
   ${lengthScaleEstimator}/lengthScaleEstimator.C
 )
 
-add_foam_library(dynamicTopoFvMesh SHARED ${sources})
+add_foam_library(dynamicTopoFvMesh SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(dynamicTopoFvMesh PUBLIC dynamicFvMesh)
diff --git a/src/dynamicMesh/meshMotion/RBFMotionSolver/CMakeLists.txt b/src/dynamicMesh/meshMotion/RBFMotionSolver/CMakeLists.txt
index 76725921f..fec3c1bfd 100644
--- a/src/dynamicMesh/meshMotion/RBFMotionSolver/CMakeLists.txt
+++ b/src/dynamicMesh/meshMotion/RBFMotionSolver/CMakeLists.txt
@@ -30,12 +30,10 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   RBFMotionSolver.C
 )
 
-add_foam_library(RBFMotionSolver SHARED ${sources})
+add_foam_library(RBFMotionSolver SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(RBFMotionSolver PUBLIC dynamicMesh)
diff --git a/src/dynamicMesh/meshMotion/fvMotionSolver/CMakeLists.txt b/src/dynamicMesh/meshMotion/fvMotionSolver/CMakeLists.txt
index 43c62e3d4..554326386 100644
--- a/src/dynamicMesh/meshMotion/fvMotionSolver/CMakeLists.txt
+++ b/src/dynamicMesh/meshMotion/fvMotionSolver/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   fvMotionSolvers/fvMotionSolver/fvMotionSolver.C
   fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
   fvMotionSolvers/velocity/refLaplacian/refVelocityLaplacianFvMotionSolver.C
@@ -61,8 +61,6 @@ list(APPEND sources
   pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
 )
 
-add_foam_library(fvMotionSolver SHARED ${sources})
+add_foam_library(fvMotionSolver SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(fvMotionSolver PUBLIC finiteVolume dynamicMesh)
diff --git a/src/dynamicMesh/meshMotion/mesquiteMotionSolver/CMakeLists.txt b/src/dynamicMesh/meshMotion/mesquiteMotionSolver/CMakeLists.txt
index a964e9961..3bf4e684d 100644
--- a/src/dynamicMesh/meshMotion/mesquiteMotionSolver/CMakeLists.txt
+++ b/src/dynamicMesh/meshMotion/mesquiteMotionSolver/CMakeLists.txt
@@ -30,12 +30,10 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   mesquiteMotionSolver.C
 )
 
-add_foam_library(mesquiteMotionSolver SHARED ${sources})
+add_foam_library(mesquiteMotionSolver SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(mesquiteMotionSolver PUBLIC dynamicMesh)
diff --git a/src/dynamicMesh/meshMotion/solidBodyMotion/CMakeLists.txt b/src/dynamicMesh/meshMotion/solidBodyMotion/CMakeLists.txt
index b9a1ce4fb..37340bd20 100644
--- a/src/dynamicMesh/meshMotion/solidBodyMotion/CMakeLists.txt
+++ b/src/dynamicMesh/meshMotion/solidBodyMotion/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   solidBodyMotionFunction/solidBodyMotionFunction.C
   solidBodyMotionFunction/newSolidBodyMotionFunction.C
   noMotion/noMotion.C
@@ -45,8 +45,6 @@ list(APPEND sources
   graphVelocity/graphVelocity.C
 )
 
-add_foam_library(solidBodyMotion SHARED ${sources})
+add_foam_library(solidBodyMotion SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(solidBodyMotion PUBLIC foam)
diff --git a/src/dynamicMesh/meshMotion/tetMotionSolver/CMakeLists.txt b/src/dynamicMesh/meshMotion/tetMotionSolver/CMakeLists.txt
index 358a607b3..5c6b37b49 100644
--- a/src/dynamicMesh/meshMotion/tetMotionSolver/CMakeLists.txt
+++ b/src/dynamicMesh/meshMotion/tetMotionSolver/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   tetMotionSolver/tetMotionSolver.C
   tetMotionSolver/laplace/laplaceTetMotionSolver.C
   tetMotionSolver/pseudoSolid/pseudoSolidTetMotionSolver.C
@@ -46,8 +46,6 @@ list(APPEND sources
   motionDiffs/file/fileDiff.C
 )
 
-add_foam_library(tetMotionSolver SHARED ${sources})
+add_foam_library(tetMotionSolver SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(tetMotionSolver PUBLIC tetFiniteElement dynamicMesh)
diff --git a/src/dynamicMesh/topoChangerFvMesh/CMakeLists.txt b/src/dynamicMesh/topoChangerFvMesh/CMakeLists.txt
index 64b343e5e..b3f28d2de 100644
--- a/src/dynamicMesh/topoChangerFvMesh/CMakeLists.txt
+++ b/src/dynamicMesh/topoChangerFvMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   topoChangerFvMesh/topoChangerFvMesh.C
   attachDetachFvMesh/attachDetachFvMesh.C
   linearValveFvMesh/linearValveFvMesh.C
@@ -43,8 +43,6 @@ list(APPEND sources
   multiMixerFvMesh/multiMixerFvMesh.C
 )
 
-add_foam_library(topoChangerFvMesh SHARED ${sources})
+add_foam_library(topoChangerFvMesh SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(topoChangerFvMesh PUBLIC dynamicFvMesh)
diff --git a/src/edgeMesh/CMakeLists.txt b/src/edgeMesh/CMakeLists.txt
index f6f362b4d..a3365972a 100644
--- a/src/edgeMesh/CMakeLists.txt
+++ b/src/edgeMesh/CMakeLists.txt
@@ -30,14 +30,12 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   edgeMesh.C
   edgeMeshIO.C
   featureEdgeMesh.C
 )
 
-add_foam_library(edgeMesh SHARED ${sources})
+add_foam_library(edgeMesh SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(edgeMesh PUBLIC foam)
diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt
index a74c343f1..25bd1200c 100644
--- a/src/engine/CMakeLists.txt
+++ b/src/engine/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   engineTime/engineTime.C
   ignition/ignition.C
   ignition/ignitionIO.C
@@ -110,14 +110,12 @@ list(APPEND sources
 )
 
 #  derivedFvPatchFields/engineTimeVaryingUniformFixedValue/engineTimeVaryingUniformFixedValueFvPatchField.C 
-list(APPEND sources
+list(APPEND SOURCES
   derivedFvPatchFields/engineTimeVaryingUniformFixedValue/engineTimeVaryingUniformFixedValueFvPatchFields.C
   derivedFvPatchFields/engineMassFlowRateInletVelocity/engineMassFlowRateInletVelocityFvPatchVectorField.C
   derivedFvPatchFields/engineTimeVaryingTotalPressureFvPatchScalarField/engineTimeVaryingTotalPressureFvPatchScalarField.C
 )
 
-add_foam_library(engine SHARED ${sources})
+add_foam_library(engine SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(engine PUBLIC dynamicFvMesh fvMotionSolver)
diff --git a/src/equationReader/CMakeLists.txt b/src/equationReader/CMakeLists.txt
index f8c9b730f..e3dbf97b8 100644
--- a/src/equationReader/CMakeLists.txt
+++ b/src/equationReader/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   equationSource/equationSources.C
   equation/equation.C
   equation/equationIO.C
@@ -42,8 +42,6 @@ list(APPEND sources
   IOEquationReader/IOEquationReaderIO.C
 )
 
-add_foam_library(equationReader SHARED ${sources})
+add_foam_library(equationReader SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(equationReader PUBLIC foam)
diff --git a/src/errorEstimation/CMakeLists.txt b/src/errorEstimation/CMakeLists.txt
index 3c563d596..509e38f37 100644
--- a/src/errorEstimation/CMakeLists.txt
+++ b/src/errorEstimation/CMakeLists.txt
@@ -32,12 +32,10 @@
 
 
 
-list(APPEND sources errorEstimate/errorEstimate.H)
+list(APPEND SOURCES errorEstimate/errorEstimate.H)
 
-add_foam_library(errorEstimation SHARED ${sources})
+add_foam_library(errorEstimation SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(errorEstimation PUBLIC finiteVolume)
 
 set_target_properties(errorEstimation PROPERTIES LINKER_LANGUAGE CXX)
diff --git a/src/finiteArea/CMakeLists.txt b/src/finiteArea/CMakeLists.txt
index 78d000a8b..ff5932da3 100644
--- a/src/finiteArea/CMakeLists.txt
+++ b/src/finiteArea/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   faMesh/faGlobalMeshData/faGlobalMeshData.C
   faMesh/faMesh.C
   faMesh/faMeshDemandDrivenData.C
@@ -39,7 +39,7 @@ list(APPEND sources
 )
 
 set(faPatches faMesh/faPatches)
-list(APPEND sources
+list(APPEND SOURCES
   ${faPatches}/faPatch/faPatch.C
   ${faPatches}/faPatch/newFaPatch.C
   ${faPatches}/basic/coupled/coupledFaPatch.C
@@ -51,7 +51,7 @@ list(APPEND sources
 )
 
 set(faMeshMapper faMesh/faMeshMapper)
-list(APPEND sources
+list(APPEND SOURCES
   ${faMeshMapper}/faMeshMapper.C
   ${faMeshMapper}/faAreaMapper.C
   ${faMeshMapper}/faEdgeMapper.C
@@ -59,12 +59,12 @@ list(APPEND sources
 )
 
 set(faPatchFields fields/faPatchFields)
-list(APPEND sources
+list(APPEND SOURCES
   ${faPatchFields}/faPatchField/faPatchFields.C
 )
 
 set(basicFaPatchFields ${faPatchFields}/basic)
-list(APPEND sources
+list(APPEND SOURCES
   ${basicFaPatchFields}/basicSymmetry/basicSymmetryFaPatchFields.C
   ${basicFaPatchFields}/basicSymmetry/basicSymmetryFaPatchScalarField.C
   ${basicFaPatchFields}/calculated/calculatedFaPatchFields.C
@@ -78,7 +78,7 @@ list(APPEND sources
 )
 
 set(constraintFaPatchFields ${faPatchFields}/constraint)
-list(APPEND sources
+list(APPEND SOURCES
   ${constraintFaPatchFields}/empty/emptyFaPatchFields.C
   ${constraintFaPatchFields}/processor/processorFaPatchFields.C
   ${constraintFaPatchFields}/processor/processorFaPatchScalarField.C
@@ -89,26 +89,26 @@ list(APPEND sources
 )
 
 set(derivedFaPatchFields ${faPatchFields}/derived)
-list(APPEND sources
+list(APPEND SOURCES
   ${derivedFaPatchFields}/fixedValueOutflow/fixedValueOutflowFaPatchFields.C
   ${derivedFaPatchFields}/inletOutlet/inletOutletFaPatchFields.C
   ${derivedFaPatchFields}/slip/slipFaPatchFields.C
 )
 
 set(faePatchFields fields/faePatchFields)
-list(APPEND sources
+list(APPEND SOURCES
   ${faePatchFields}/faePatchField/faePatchFields.C
 )
 
 set(basicFaePatchFields ${faePatchFields}/basic)
-list(APPEND sources
+list(APPEND SOURCES
   ${basicFaePatchFields}/calculated/calculatedFaePatchFields.C
   ${basicFaePatchFields}/coupled/coupledFaePatchFields.C
   ${basicFaePatchFields}/fixedValue/fixedValueFaePatchFields.C
 )
 
 set(constraintFaePatchFields ${faePatchFields}/constraint)
-list(APPEND sources
+list(APPEND SOURCES
   ${constraintFaePatchFields}/empty/emptyFaePatchFields.C
   ${constraintFaePatchFields}/processor/processorFaePatchFields.C
   ${constraintFaePatchFields}/wedge/wedgeFaePatchFields.C
@@ -121,13 +121,13 @@ list(APPEND sources
 )
 
 set(edgeInterpolation interpolation/edgeInterpolation)
-list(APPEND sources
+list(APPEND SOURCES
   ${edgeInterpolation}/edgeInterpolation.C
   ${edgeInterpolation}/edgeInterpolationScheme/edgeInterpolationSchemes.C
 )
 
 set(schemes ${edgeInterpolation}/schemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${schemes}/linear/linearEdgeInterpolationMake.C
   ${schemes}/upwind/upwindEdgeInterpolationMake.C
   ${schemes}/linearUpwind/linearUpwindEdgeInterpolationMake.C
@@ -138,7 +138,7 @@ list(APPEND sources
 )
 
 set(ddtSchemes finiteArea/ddtSchemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${ddtSchemes}/faDdtScheme/faDdtSchemes.C
   ${ddtSchemes}/steadyStateFaDdtScheme/steadyStateFaDdtSchemes.C
   ${ddtSchemes}/EulerFaDdtScheme/EulerFaDdtSchemes.C
@@ -147,13 +147,13 @@ list(APPEND sources
 )
 
 set(divSchemes finiteArea/divSchemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${divSchemes}/faDivScheme/faDivSchemes.C
   ${divSchemes}/gaussFaDivScheme/gaussFaDivSchemes.C
 )
 
 set(gradSchemes finiteArea/gradSchemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${gradSchemes}/faGradScheme/faGradSchemes.C
   ${gradSchemes}/gaussFaGrad/gaussFaGrads.C
   ${gradSchemes}/leastSquaresFaGrad/leastSquaresFaVectors.C
@@ -161,13 +161,13 @@ list(APPEND sources
 )
 
 set(limitedGradSchemes ${gradSchemes}/limitedGradSchemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${limitedGradSchemes}/faceLimitedFaGrad/faceLimitedFaGrads.C
   ${limitedGradSchemes}/edgeLimitedFaGrad/edgeLimitedFaGrads.C
 )
 
 set(lnGradSchemes finiteArea/lnGradSchemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${lnGradSchemes}/lnGradScheme/lnGradSchemes.C
   ${lnGradSchemes}/correctedLnGrad/correctedLnGrads.C
   ${lnGradSchemes}/limitedLnGrad/limitedLnGrads.C
@@ -175,19 +175,17 @@ list(APPEND sources
 )
 
 set(laplacianSchemes finiteArea/laplacianSchemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${laplacianSchemes}/faLaplacianScheme/faLaplacianSchemes.C
   ${laplacianSchemes}/gaussFaLaplacianScheme/gaussFaLaplacianSchemes.C
 )
 
 set(convectionSchemes finiteArea/convectionSchemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${convectionSchemes}/faConvectionScheme/faConvectionSchemes.C
   ${convectionSchemes}/gaussFaConvectionScheme/gaussFaConvectionSchemes.C
 )
 
-add_foam_library(finiteArea SHARED ${sources})
+add_foam_library(finiteArea SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(finiteArea PUBLIC foam)
diff --git a/src/finiteVolume/CMakeLists.txt b/src/finiteVolume/CMakeLists.txt
index cc12f2f9e..cef1ac55f 100644
--- a/src/finiteVolume/CMakeLists.txt
+++ b/src/finiteVolume/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   fvMesh/fvMeshGeometry.C
   fvMesh/fvMesh.C
   fvMesh/singleCellFvMesh/singleCellFvMesh.C
@@ -38,24 +38,24 @@ list(APPEND sources
 )
 
 set(fvBoundaryMesh fvMesh/fvBoundaryMesh)
-list(APPEND sources
+list(APPEND SOURCES
   ${fvBoundaryMesh}/fvBoundaryMesh.C
 )
 
 set(fvPatches fvMesh/fvPatches)
-list(APPEND sources
+list(APPEND SOURCES
   ${fvPatches}/fvPatch/fvPatch.C
   ${fvPatches}/fvPatch/newFvPatch.C
 )
 
 set(basicFvPatches ${fvPatches}/basic)
-list(APPEND sources
+list(APPEND SOURCES
   ${basicFvPatches}/coupled/coupledFvPatch.C
   ${basicFvPatches}/generic/genericFvPatch.C
 )
 
 set(constraintFvPatches ${fvPatches}/constraint)
-list(APPEND sources
+list(APPEND SOURCES
   ${constraintFvPatches}/empty/emptyFvPatch.C
   ${constraintFvPatches}/symmetry/symmetryFvPatch.C
   ${constraintFvPatches}/wedge/wedgeFvPatch.C
@@ -69,7 +69,7 @@ list(APPEND sources
 )
 
 set(derivedFvPatches ${fvPatches}/derived)
-list(APPEND sources
+list(APPEND SOURCES
   ${derivedFvPatches}/wall/wallFvPatch.C
   ${derivedFvPatches}/directMapped/directMappedFvPatch.C
   ${derivedFvPatches}/cohesive/cohesiveFvPatch.C
@@ -77,7 +77,7 @@ list(APPEND sources
 )
 
 set(wallDist fvMesh/wallDist)
-list(APPEND sources
+list(APPEND SOURCES
   ${wallDist}/wallPointYPlus/wallPointYPlus.C
   ${wallDist}/nearWallDistNoSearch.C
   ${wallDist}/nearWallDist.C
@@ -88,7 +88,7 @@ list(APPEND sources
 
 
 set(fvMeshMapper fvMesh/fvMeshMapper)
-list(APPEND sources
+list(APPEND SOURCES
   ${fvMeshMapper}/fvPatchMapper.C
   ${fvMeshMapper}/fvSurfaceMapper.C
 )
@@ -96,7 +96,7 @@ list(APPEND sources
 set(extendedStencil fvMesh/extendedStencil)
 
 set(cellToCell ${extendedStencil}/cellToCell)
-list(APPEND sources
+list(APPEND SOURCES
   ${cellToCell}/fullStencils/cellToCellStencil.C
   ${cellToCell}/fullStencils/CFCCellToCellStencil.C
   ${cellToCell}/fullStencils/CPCCellToCellStencil.C
@@ -104,7 +104,7 @@ list(APPEND sources
 )
 
 set(cellToFace ${extendedStencil}/cellToFace)
-list(APPEND sources
+list(APPEND SOURCES
   ${cellToFace}/fullStencils/cellToFaceStencil.C
   ${cellToFace}/fullStencils/CFCCellToFaceStencil.C
   ${cellToFace}/fullStencils/CECCellToFaceStencil.C
@@ -125,7 +125,7 @@ list(APPEND sources
 )
 
 set(faceToCell ${extendedStencil}/faceToCell)
-list(APPEND sources
+list(APPEND SOURCES
   ${faceToCell}/fullStencils/faceToCellStencil.C
   ${faceToCell}/fullStencils/CFCFaceToCellStencil.C
   ${faceToCell}/extendedFaceToCellStencil.C
@@ -135,13 +135,13 @@ list(APPEND sources
 
 
 set(fvPatchFields fields/fvPatchFields)
-list(APPEND sources
+list(APPEND SOURCES
   ${fvPatchFields}/fvPatchField/fvPatchFields.C
   ${fvPatchFields}/fvPatchField/fvPatchVectorNFields.C
 )
 
 set(basicFvPatchFields ${fvPatchFields}/basic)
-list(APPEND sources
+list(APPEND SOURCES
   ${basicFvPatchFields}/basicSymmetry/basicSymmetryFvPatchFields.C
   ${basicFvPatchFields}/basicSymmetry/basicSymmetryFvPatchScalarField.C
   ${basicFvPatchFields}/calculated/calculatedFvPatchFields.C
@@ -165,7 +165,7 @@ list(APPEND sources
 )
 
 set(constraintFvPatchFields ${fvPatchFields}/constraint)
-list(APPEND sources
+list(APPEND SOURCES
   ${constraintFvPatchFields}/cyclic/cyclicFvPatchFields.C
   ${constraintFvPatchFields}/cyclic/cyclicFvPatchVectorNFields.C
   ${constraintFvPatchFields}/empty/emptyFvPatchFields.C
@@ -189,7 +189,7 @@ list(APPEND sources
 )
 
 set(derivedFvPatchFields ${fvPatchFields}/derived)
-list(APPEND sources
+list(APPEND SOURCES
   ${derivedFvPatchFields}/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
   ${derivedFvPatchFields}/advective/advectiveFvPatchFields.C
   ${derivedFvPatchFields}/directMappedFixedValue/directMappedFixedValueFvPatchFields.C
@@ -248,12 +248,12 @@ list(APPEND sources
 )
 
 set(fvsPatchFields fields/fvsPatchFields)
-list(APPEND sources
+list(APPEND SOURCES
   ${fvsPatchFields}/fvsPatchField/fvsPatchFields.C
 )
 
 set(basicFvsPatchFields ${fvsPatchFields}/basic)
-list(APPEND sources
+list(APPEND SOURCES
   ${basicFvsPatchFields}/calculated/calculatedFvsPatchFields.C
   ${basicFvsPatchFields}/coupled/coupledFvsPatchFields.C
   ${basicFvsPatchFields}/fixedValue/fixedValueFvsPatchFields.C
@@ -261,7 +261,7 @@ list(APPEND sources
 )
 
 set(constraintFvsPatchFields ${fvsPatchFields}/constraint)
-list(APPEND sources
+list(APPEND SOURCES
   ${constraintFvsPatchFields}/cyclic/cyclicFvsPatchFields.C
   ${constraintFvsPatchFields}/empty/emptyFvsPatchFields.C
   ${constraintFvsPatchFields}/processor/processorFvsPatchFields.C
@@ -275,7 +275,7 @@ list(APPEND sources
 )
 
 set(fvsPatchVectorNFields ${fvsPatchFields}/fvsPatchVectorNFields)
-list(APPEND sources
+list(APPEND SOURCES
   ${fvsPatchVectorNFields}/fvsPatchVectorNFields.C
   ${fvsPatchVectorNFields}/calculatedFvsPatchVectorNFields.C
   ${fvsPatchVectorNFields}/emptyFvsPatchVectorNFields.C
@@ -293,7 +293,7 @@ list(APPEND sources
 )
 
 set(interpolation interpolation/interpolation)
-list(APPEND sources
+list(APPEND SOURCES
   ${interpolation}/interpolation/interpolations.C
   ${interpolation}/interpolationCell/makeInterpolationCell.C
   ${interpolation}/interpolationCellPoint/cellPointWeight/cellPointWeight.C
@@ -304,26 +304,26 @@ list(APPEND sources
 )
 
 set(volPointInterpolation interpolation/volPointInterpolation)
-list(APPEND sources
+list(APPEND SOURCES
   ${volPointInterpolation}/pointPatchInterpolation/pointPatchInterpolation.C
   ${volPointInterpolation}/volPointInterpolation.C
   ${volPointInterpolation}/leastSquaresVolPointInterpolation/leastSquaresVolPointInterpolation.C
 )
 
 set(pointVolInterpolation interpolation/pointVolInterpolation)
-list(APPEND sources
+list(APPEND SOURCES
   ${pointVolInterpolation}/pointVolInterpolation.C
 )
 
 set(surfaceInterpolation interpolation/surfaceInterpolation)
-list(APPEND sources
+list(APPEND SOURCES
   ${surfaceInterpolation}/surfaceInterpolation/surfaceInterpolation.C
   ${surfaceInterpolation}/surfaceInterpolationScheme/surfaceInterpolationSchemes.C
   ${surfaceInterpolation}/VectorNSurfaceInterpolationSchemes/VectorNSurfaceInterpolationSchemes.C
 )
 
 set(schemes ${surfaceInterpolation}/schemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${schemes}/linear/linear.C
   ${schemes}/midPoint/midPoint.C
   ${schemes}/downwind/downwind.C
@@ -351,12 +351,12 @@ list(APPEND sources
 )
 # 
 # $(schemes)/quadraticLinearPureUpwindFit/quadraticLinearPureUpwindFit.C
-list(APPEND sources
+list(APPEND SOURCES
   ${schemes}/linearPureUpwindFit/linearPureUpwindFit.C
 )
 
 set(limitedSchemes ${surfaceInterpolation}/limitedSchemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${limitedSchemes}/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationSchemes.C
   ${limitedSchemes}/upwind/upwind.C
   ${limitedSchemes}/blended/blended.C
@@ -383,7 +383,7 @@ list(APPEND sources
 )
 
 set(multivariateSchemes ${surfaceInterpolation}/multivariateSchemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${multivariateSchemes}/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationSchemes.C
   ${multivariateSchemes}/multivariateSelectionScheme/multivariateSelectionSchemes.C
   ${multivariateSchemes}/upwind/multivariateUpwind.C
@@ -399,7 +399,7 @@ list(APPEND sources
 )
 
 set(ddtSchemes finiteVolume/ddtSchemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${ddtSchemes}/ddtScheme/ddtSchemes.C
   ${ddtSchemes}/steadyStateDdtScheme/steadyStateDdtSchemes.C
   ${ddtSchemes}/EulerDdtScheme/EulerDdtSchemes.C
@@ -413,7 +413,7 @@ list(APPEND sources
 )
 
 set(d2dt2Schemes finiteVolume/d2dt2Schemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${d2dt2Schemes}/d2dt2Scheme/d2dt2Schemes.C
   ${d2dt2Schemes}/steadyStateD2dt2Scheme/steadyStateD2dt2Schemes.C
   ${d2dt2Schemes}/EulerD2dt2Scheme/EulerD2dt2Schemes.C
@@ -421,14 +421,14 @@ list(APPEND sources
 )
 
 set(divSchemes finiteVolume/divSchemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${divSchemes}/divScheme/divSchemes.C
   ${divSchemes}/gaussDivScheme/gaussDivSchemes.C
   ${divSchemes}/gaussDivScheme/vectorGaussDivScheme.C
 )
 
 set(gradSchemes finiteVolume/gradSchemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${gradSchemes}/gradScheme/gradSchemes.C
   ${gradSchemes}/gaussGrad/scalarGaussGrad.C
   ${gradSchemes}/gaussGrad/gaussGrads.C
@@ -442,7 +442,7 @@ list(APPEND sources
 )
 
 set(limitedGradSchemes ${gradSchemes}/limitedGradSchemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${limitedGradSchemes}/faceLimitedGrad/faceLimitedGrads.C
   ${limitedGradSchemes}/cellLimitedGrad/cellLimitedGrads.C
   ${limitedGradSchemes}/faceMDLimitedGrad/faceMDLimitedGrads.C
@@ -450,7 +450,7 @@ list(APPEND sources
 )
 
 set(snGradSchemes finiteVolume/snGradSchemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${snGradSchemes}/snGradScheme/snGradSchemes.C
   ${snGradSchemes}/correctedSnGrad/correctedSnGrads.C
   ${snGradSchemes}/limitedSnGrad/limitedSnGrads.C
@@ -464,7 +464,7 @@ list(APPEND sources
 # $(snGradSchemes)/quadraticFitSnGrad/quadraticFitSnGrads.C
 
 set(convectionSchemes finiteVolume/convectionSchemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${convectionSchemes}/convectionScheme/convectionSchemes.C
   ${convectionSchemes}/gaussConvectionScheme/gaussConvectionSchemes.C
   ${convectionSchemes}/noConvectionScheme/noConvectionSchemes.C
@@ -473,14 +473,14 @@ list(APPEND sources
 )
 
 set(adjConvectionSchemes finiteVolume/adjConvectionSchemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${adjConvectionSchemes}/adjConvectionScheme/adjConvectionSchemes.C
   ${adjConvectionSchemes}/noAdjConvectionScheme/noAdjConvectionSchemes.C
   ${adjConvectionSchemes}/explicitAdjConvectionScheme/explicitAdjConvectionSchemes.C
 )
 
 set(laplacianSchemes finiteVolume/laplacianSchemes)
-list(APPEND sources
+list(APPEND SOURCES
   ${laplacianSchemes}/laplacianScheme/laplacianSchemes.C
   ${laplacianSchemes}/gaussLaplacianScheme/gaussLaplacianSchemes.C
   ${laplacianSchemes}/noLaplacianScheme/noLaplacianSchemes.C
@@ -488,14 +488,14 @@ list(APPEND sources
 )
 
 set(general cfdTools/general)
-list(APPEND sources
+list(APPEND SOURCES
   ${general}/findRefCell/findRefCell.C
   ${general}/adjustPhi/adjustPhi.C
   ${general}/bound/bound.C
 )
 
 set(solutionControl ${general}/solutionControl)
-list(APPEND sources
+list(APPEND SOURCES
   ${solutionControl}/solutionControl/solutionControl.C
   ${solutionControl}/simpleControl/simpleControl.C
   ${solutionControl}/pimpleControl/pimpleControl.C
@@ -503,19 +503,19 @@ list(APPEND sources
 )
 
 set(porousMedia ${general}/porousMedia)
-list(APPEND sources
+list(APPEND SOURCES
   ${porousMedia}/porousZone.C
   ${porousMedia}/porousZones.C
 )
 
 set(MRF ${general}/MRF)
-list(APPEND sources
+list(APPEND SOURCES
   ${MRF}/MRFZone.C
   ${MRF}/MRFZones.C
 )
 
 set(SRF ${general}/SRF)
-list(APPEND sources
+list(APPEND SOURCES
   ${SRF}/SRFModel/SRFModel/SRFModel.C
   ${SRF}/SRFModel/SRFModel/newSRFModel.C
   ${SRF}/SRFModel/rpm/rpm.C
@@ -527,13 +527,11 @@ list(APPEND sources
 )
 
 set(fieldSources ${general}/fieldSources)
-list(APPEND sources
+list(APPEND SOURCES
   ${fieldSources}/pressureGradientExplicitSource/pressureGradientExplicitSource.C
   ${fieldSources}/timeActivatedExplicitSource/timeActivatedExplicitSource.C
 )
 
-add_foam_library(finiteVolume SHARED ${sources})
+add_foam_library(finiteVolume SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(finiteVolume PUBLIC meshTools)
diff --git a/src/foam/CMakeLists.txt b/src/foam/CMakeLists.txt
index fb42e269b..b893d1858 100644
--- a/src/foam/CMakeLists.txt
+++ b/src/foam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   global/global.C
   global/dimensionedConstants/dimensionedConstants.C
   global/argList/argList.C
@@ -47,7 +47,7 @@ list(APPEND sources
 )
 
 set(bools primitives/bools)
-list(APPEND sources
+list(APPEND SOURCES
   ${bools}/bool/bool.C
   ${bools}/bool/boolIO.C
   ${bools}/Switch/Switch.C
@@ -56,7 +56,7 @@ list(APPEND sources
 )
 
 set(ints primitives/ints)
-list(APPEND sources
+list(APPEND SOURCES
   ${ints}/int/intIO.C
   ${ints}/uint/uintIO.C
   ${ints}/long/longIO.C
@@ -91,7 +91,7 @@ list(APPEND sources
 )
 
 set(strings primitives/strings)
-list(APPEND sources
+list(APPEND SOURCES
   ${strings}/string/foamString.C
   ${strings}/string/foamStringIO.C
   ${strings}/word/word.C
@@ -104,7 +104,7 @@ list(APPEND sources
 )
 
 set(sha1 primitives/hashes/SHA1)
-list(APPEND sources
+list(APPEND SOURCES
   ${sha1}/SHA1.C
   ${sha1}/SHA1Digest.C
   coordinateSystems/coordinateSystem.C
@@ -130,7 +130,7 @@ list(APPEND sources
 )
 
 set(primitiveLists primitives/Lists)
-list(APPEND sources
+list(APPEND SOURCES
   ${primitiveLists}/boolList.C
   ${primitiveLists}/diagTensorList.C
   ${primitiveLists}/labelIOList.C
@@ -146,19 +146,19 @@ list(APPEND sources
 )
 
 set(Streams db/IOstreams)
-list(APPEND sources
+list(APPEND SOURCES
   ${Streams}/token/tokenIO.C
 )
 
 set(IOstreams ${Streams}/IOstreams)
-list(APPEND sources
+list(APPEND SOURCES
   ${IOstreams}/IOstream.C
   ${IOstreams}/Istream.C
   ${IOstreams}/Ostream.C
 )
 
 set(Sstreams ${Streams}/Sstreams)
-list(APPEND sources
+list(APPEND SOURCES
   ${Sstreams}/ISstream.C
   ${Sstreams}/OSstream.C
   ${Sstreams}/SstreamsPrint.C
@@ -167,28 +167,28 @@ list(APPEND sources
 )
 
 set(gzstream ${Streams}/gzstream)
-list(APPEND sources
+list(APPEND SOURCES
   ${gzstream}/gzstream.C
 )
 
 set(Fstreams ${Streams}/Fstreams)
-list(APPEND sources
+list(APPEND SOURCES
   ${Fstreams}/IFstream.C
   ${Fstreams}/OFstream.C
 )
 
 set(Tstreams ${Streams}/Tstreams)
-list(APPEND sources
+list(APPEND SOURCES
   ${Tstreams}/ITstream.C
 )
 
 set(StringStreams ${Streams}/StringStreams)
-list(APPEND sources
+list(APPEND SOURCES
   ${StringStreams}/StringStreamsPrint.C
 )
 
 set(Pstreams ${Streams}/Pstreams)
-list(APPEND sources
+list(APPEND SOURCES
   ${Pstreams}/Pstream.C
   ${Pstreams}/PstreamCommsStruct.C
   ${Pstreams}/PstreamGlobals.C
@@ -200,31 +200,31 @@ list(APPEND sources
 )
 
 set(dictionary db/dictionary)
-list(APPEND sources
+list(APPEND SOURCES
   ${dictionary}/dictionary.C
   ${dictionary}/dictionaryIO.C
 )
 
 set(entry ${dictionary}/entry)
-list(APPEND sources
+list(APPEND SOURCES
   ${entry}/entry.C
   ${entry}/entryIO.C
 )
 
 set(primitiveEntry ${dictionary}/primitiveEntry)
-list(APPEND sources
+list(APPEND SOURCES
   ${primitiveEntry}/primitiveEntry.C
   ${primitiveEntry}/primitiveEntryIO.C
 )
 
 set(dictionaryEntry ${dictionary}/dictionaryEntry)
-list(APPEND sources
+list(APPEND SOURCES
   ${dictionaryEntry}/dictionaryEntry.C
   ${dictionaryEntry}/dictionaryEntryIO.C
 )
 
 set(functionEntries ${dictionary}/functionEntries)
-list(APPEND sources
+list(APPEND SOURCES
   ${functionEntries}/functionEntry/functionEntry.C
   ${functionEntries}/includeEntry/includeEntry.C
   ${functionEntries}/includeIfPresentEntry/includeIfPresentEntry.C
@@ -233,14 +233,14 @@ list(APPEND sources
 )
 
 set(IOdictionary db/IOobjects/IOdictionary)
-list(APPEND sources
+list(APPEND SOURCES
   ${IOdictionary}/IOdictionary.C
   ${IOdictionary}/IOdictionaryIO.C
   db/IOobjects/IOMap/IOMapName.C
 )
 
 set(IOobject db/IOobject)
-list(APPEND sources
+list(APPEND SOURCES
   ${IOobject}/IOobject.C
   ${IOobject}/IOobjectIO.C
   ${IOobject}/IOobjectReadHeader.C
@@ -248,7 +248,7 @@ list(APPEND sources
 )
 
 set(regIOobject db/regIOobject)
-list(APPEND sources
+list(APPEND SOURCES
   ${regIOobject}/regIOobject.C
   ${regIOobject}/regIOobjectRead.C
   ${regIOobject}/regIOobjectWrite.C
@@ -263,7 +263,7 @@ list(APPEND sources
 )
 
 set(Time db/Time)
-list(APPEND sources
+list(APPEND SOURCES
   ${Time}/TimePaths.C
   ${Time}/TimeState.C
   ${Time}/foamTime.C
@@ -290,21 +290,21 @@ list(APPEND sources
 )
 
 set(scalarMatrices matrices/scalarMatrices)
-list(APPEND sources
+list(APPEND SOURCES
   ${scalarMatrices}/scalarMatrices.C
   ${scalarMatrices}/scalarSquareMatrix.C
   ${scalarMatrices}/SVD/SVD.C
 )
 
 set(LUscalarMatrix matrices/LUscalarMatrix)
-list(APPEND sources
+list(APPEND SOURCES
   ${LUscalarMatrix}/LUscalarMatrix.C
   ${LUscalarMatrix}/procLduMatrix.C
   ${LUscalarMatrix}/procLduInterface.C
 )
 
 set(lduMatrix matrices/lduMatrix)
-list(APPEND sources
+list(APPEND SOURCES
   ${lduMatrix}/lduMatrix/lduMatrix.C
   ${lduMatrix}/lduMatrix/lduMatrixOperations.C
   ${lduMatrix}/lduMatrix/lduMatrixATmul.C
@@ -333,13 +333,13 @@ list(APPEND sources
 )
 
 set(lduAddressing ${lduMatrix}/lduAddressing)
-list(APPEND sources
+list(APPEND SOURCES
   ${lduAddressing}/lduAddressing.C
   ${lduAddressing}/extendedLduAddressing/extendedLduAddressing.C
 )
 
 set(lduInterfaces ${lduAddressing}/lduInterfaces)
-list(APPEND sources
+list(APPEND SOURCES
   ${lduInterfaces}/lduInterface/lduInterface.C
   ${lduInterfaces}/processorLduInterface/processorLduInterface.C
   ${lduInterfaces}/cyclicLduInterface/cyclicLduInterface.C
@@ -350,7 +350,7 @@ list(APPEND sources
 )
 
 set(lduInterfaceFields ${lduAddressing}/lduInterfaceFields)
-list(APPEND sources
+list(APPEND SOURCES
   ${lduInterfaceFields}/lduInterfaceField/lduInterfaceField.C
   ${lduInterfaceFields}/processorLduInterfaceField/processorLduInterfaceField.C
   ${lduInterfaceFields}/cyclicLduInterfaceField/cyclicLduInterfaceField.C
@@ -361,7 +361,7 @@ list(APPEND sources
 )
 
 set(AMG ${lduMatrix}/solvers/AMG)
-list(APPEND sources
+list(APPEND SOURCES
   ${AMG}/GAMGSolver.C
   ${AMG}/GAMGSolverAgglomerateMatrix.C
   ${AMG}/GAMGSolverScalingFactor.C
@@ -369,7 +369,7 @@ list(APPEND sources
 )
 
 set(AMGInterfaces ${AMG}/interfaces)
-list(APPEND sources
+list(APPEND SOURCES
   ${AMGInterfaces}/AMGInterface/AMGInterface.C
   ${AMGInterfaces}/AMGInterface/newAMGInterface.C
   ${AMGInterfaces}/processorAMGInterface/processorAMGInterface.C
@@ -381,7 +381,7 @@ list(APPEND sources
 )
 
 set(AMGInterfaceFields ${AMG}/interfaceFields)
-list(APPEND sources
+list(APPEND SOURCES
   ${AMGInterfaceFields}/AMGInterfaceField/AMGInterfaceField.C
   ${AMGInterfaceFields}/AMGInterfaceField/newAMGInterfaceField.C
   ${AMGInterfaceFields}/processorAMGInterfaceField/processorAMGInterfaceField.C
@@ -395,20 +395,20 @@ list(APPEND sources
 set(AMGAgglomerations ${AMG}/AMGAgglomerations)
 
 set(GAMGAgglomeration ${AMGAgglomerations}/GAMGAgglomeration)
-list(APPEND sources
+list(APPEND SOURCES
   ${GAMGAgglomeration}/GAMGAgglomeration.C
   ${GAMGAgglomeration}/GAMGAgglomerateLduAddressing.C
 )
 
 set(pairGAMGAgglomeration ${AMGAgglomerations}/pairGAMGAgglomeration)
-list(APPEND sources
+list(APPEND SOURCES
   ${pairGAMGAgglomeration}/pairGAMGAgglomeration.C
   ${pairGAMGAgglomeration}/pairGAMGAgglomerate.C
   ${pairGAMGAgglomeration}/pairGAMGAgglomerationCombineLevels.C
 )
 
 set(algebraicPairGAMGAgglomeration ${AMGAgglomerations}/algebraicPairGAMGAgglomeration)
-list(APPEND sources
+list(APPEND SOURCES
   ${algebraicPairGAMGAgglomeration}/algebraicPairGAMGAgglomeration.C
   meshes/lduMesh/lduMesh.C
   meshes/MeshObject/meshObjectBase.C
@@ -416,7 +416,7 @@ list(APPEND sources
 
 set(primitiveShapes meshes/primitiveShapes)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${primitiveShapes}/line/line.C
   ${primitiveShapes}/plane/plane.C
   ${primitiveShapes}/triangle/triangleFuncs.C
@@ -424,13 +424,13 @@ list(APPEND sources
 )
 
 set(meshShapes meshes/meshShapes)
-list(APPEND sources
+list(APPEND SOURCES
   ${meshShapes}/edge/edge.C
   ${meshShapes}/edge/edgeIOList.C
 )
 
 set(face ${meshShapes}/face)
-list(APPEND sources
+list(APPEND SOURCES
   ${face}/face.C
   ${face}/faceIntersection.C
   ${face}/faceContactSphere.C
@@ -439,30 +439,30 @@ list(APPEND sources
 )
 
 set(cell ${meshShapes}/cell)
-list(APPEND sources
+list(APPEND SOURCES
   ${cell}/cell.C
   ${cell}/oppositeCellFace.C
   ${cell}/cellIOList.C
 )
 
 set(tetCell ${meshShapes}/tetCell)
-list(APPEND sources
+list(APPEND SOURCES
   ${tetCell}/tetCell.C
 )
 
 set(cellModeller ${meshShapes}/cellModeller)
-list(APPEND sources
+list(APPEND SOURCES
   ${cellModeller}/cellModeller.C
 )
 
 set(cellModel ${meshShapes}/cellModel)
-list(APPEND sources
+list(APPEND SOURCES
   ${cellModel}/cellModel.C
   ${cellModel}/cellModelIO.C
 )
 
 set(cellShape ${meshShapes}/cellShape)
-list(APPEND sources
+list(APPEND SOURCES
   ${cellShape}/cellShape.C
   ${cellShape}/cellShapeEqual.C
   ${cellShape}/cellShapeIO.C
@@ -473,19 +473,19 @@ list(APPEND sources
 set(polyMesh meshes/polyMesh)
 
 set(polyPatches ${polyMesh}/polyPatches)
-list(APPEND sources
+list(APPEND SOURCES
   ${polyPatches}/polyPatch/polyPatch.C
   ${polyPatches}/polyPatch/newPolyPatch.C
 )
 
 set(basicPolyPatches ${polyPatches}/basic)
-list(APPEND sources
+list(APPEND SOURCES
   ${basicPolyPatches}/coupled/coupledPolyPatch.C
   ${basicPolyPatches}/generic/genericPolyPatch.C
 )
 
 set(constraintPolyPatches ${polyPatches}/constraint)
-list(APPEND sources
+list(APPEND SOURCES
   ${constraintPolyPatches}/empty/emptyPolyPatch.C
   ${constraintPolyPatches}/symmetry/symmetryPolyPatch.C
   ${constraintPolyPatches}/wedge/wedgePolyPatch.C
@@ -500,20 +500,20 @@ list(APPEND sources
 )
 
 set(derivedPolyPatches ${polyPatches}/derived)
-list(APPEND sources
+list(APPEND SOURCES
   ${derivedPolyPatches}/wall/wallPolyPatch.C
   ${derivedPolyPatches}/cohesive/cohesivePolyPatch.C
 )
 
 set(polyBoundaryMesh ${polyMesh}/polyBoundaryMesh)
-list(APPEND sources
+list(APPEND SOURCES
   ${polyBoundaryMesh}/polyBoundaryMesh.C
   ${polyBoundaryMesh}/polyBoundaryMeshEntries.C
   meshes/ProcessorTopology/commSchedule.C
 )
 
 set(globalMeshData ${polyMesh}/globalMeshData)
-list(APPEND sources
+list(APPEND SOURCES
   ${globalMeshData}/globalMeshData.C
   ${globalMeshData}/globalPoints.C
   ${globalMeshData}/globalIndex.C
@@ -523,19 +523,19 @@ list(APPEND sources
 set(zones ${polyMesh}/zones)
 
 set(cellZone ${zones}/cellZone)
-list(APPEND sources
+list(APPEND SOURCES
   ${cellZone}/cellZone.C
   ${cellZone}/newCellZone.C
 )
 
 set(faceZone ${zones}/faceZone)
-list(APPEND sources
+list(APPEND SOURCES
   ${faceZone}/faceZone.C
   ${faceZone}/newFaceZone.C
 )
 
 set(pointZone ${polyMesh}/zones/pointZone)
-list(APPEND sources
+list(APPEND SOURCES
   ${pointZone}/pointZone.C
   ${pointZone}/newPointZone.C
   ${polyMesh}/polyMesh.C
@@ -547,7 +547,7 @@ list(APPEND sources
 )
 
 set(primitiveMesh meshes/primitiveMesh)
-list(APPEND sources
+list(APPEND SOURCES
   ${primitiveMesh}/primitiveMesh.C
   ${primitiveMesh}/primitiveMeshCellCells.C
   ${primitiveMesh}/primitiveMeshCellCentresAndVols.C
@@ -568,7 +568,7 @@ list(APPEND sources
 )
 
 set(primitiveMeshCheck ${primitiveMesh}/primitiveMeshCheck)
-list(APPEND sources
+list(APPEND SOURCES
   ${primitiveMeshCheck}/primitiveMeshCheck.C
   ${primitiveMeshCheck}/primitiveMeshCheckMotion.C
   ${primitiveMeshCheck}/primitiveMeshCheckPointNearness.C
@@ -576,13 +576,13 @@ list(APPEND sources
 )
 
 set(primitivePatch ${primitiveMesh}/primitivePatch)
-list(APPEND sources
+list(APPEND SOURCES
   ${primitivePatch}/patchZones.C
   ${primitivePatch}/walkPatch.C
 )
 
 set(cellMatcher ${meshShapes}/cellMatcher)
-list(APPEND sources
+list(APPEND SOURCES
   ${cellMatcher}/cellMatcher.C
   ${cellMatcher}/hexMatcher.C
   ${cellMatcher}/wedgeMatcher.C
@@ -594,7 +594,7 @@ list(APPEND sources
 )
 
 set(mapPolyMesh ${polyMesh}/mapPolyMesh)
-list(APPEND sources
+list(APPEND SOURCES
   ${mapPolyMesh}/mapPolyMesh.C
   ${mapPolyMesh}/pointMapper/pointMapper.C
   ${mapPolyMesh}/faceMapper/faceMapper.C
@@ -605,35 +605,35 @@ list(APPEND sources
 )
 
 set(PrimitivePatch ${primitiveMesh}/PrimitivePatchTemplate)
-list(APPEND sources
+list(APPEND SOURCES
   ${PrimitivePatch}/PrimitivePatchName.C
 )
 
 set(pointMesh meshes/pointMesh)
-list(APPEND sources
+list(APPEND SOURCES
   ${pointMesh}/pointMesh.C
 )
 
 set(pointMeshMapper ${pointMesh}/pointMeshMapper)
-list(APPEND sources
+list(APPEND SOURCES
   ${pointMeshMapper}/pointPatchMapper.C
 )
 
 set(pointPatches ${pointMesh}/pointPatches)
-list(APPEND sources
+list(APPEND SOURCES
   ${pointPatches}/pointPatch/pointPatch.C
   ${pointPatches}/facePointPatch/facePointPatch.C
   ${pointPatches}/facePointPatch/newFacePointPatch.C
 )
 
 set(basicPointPatches ${pointPatches}/basic)
-list(APPEND sources
+list(APPEND SOURCES
   ${basicPointPatches}/coupled/coupledPointPatch.C
   ${basicPointPatches}/generic/genericPointPatch.C
 )
 
 set(constraintPointPatches ${pointPatches}/constraint)
-list(APPEND sources
+list(APPEND SOURCES
   ${constraintPointPatches}/empty/emptyPointPatch.C
   ${constraintPointPatches}/symmetry/symmetryPointPatch.C
   ${constraintPointPatches}/wedge/wedgePointPatch.C
@@ -647,7 +647,7 @@ list(APPEND sources
 )
 
 set(derivedPointPatches ${pointPatches}/derived)
-list(APPEND sources
+list(APPEND SOURCES
   ${derivedPointPatches}/coupled/coupledFacePointPatch.C
   ${derivedPointPatches}/global/globalPointPatch.C
   ${derivedPointPatches}/wall/wallPointPatch.C
@@ -655,13 +655,13 @@ list(APPEND sources
 )
 
 set(pointBoundaryMesh ${pointMesh}/pointBoundaryMesh)
-list(APPEND sources
+list(APPEND SOURCES
   ${pointBoundaryMesh}/pointBoundaryMesh.C
   meshes/boundBox/boundBox.C
 )
 
 set(meshTools meshes/meshTools)
-list(APPEND sources
+list(APPEND SOURCES
   ${meshTools}/meshTools.C
   ${meshTools}/matchPoints.C
   ${meshTools}/mergePoints.C
@@ -670,7 +670,7 @@ list(APPEND sources
 )
 
 set(Fields fields/Fields)
-list(APPEND sources
+list(APPEND SOURCES
   ${Fields}/labelField/labelField.C
   ${Fields}/scalarField/scalarField.C
   ${Fields}/vectorField/vectorField.C
@@ -698,12 +698,12 @@ list(APPEND sources
 )
 
 set(pointPatchFields fields/pointPatchFields)
-list(APPEND sources
+list(APPEND SOURCES
   ${pointPatchFields}/pointPatchField/pointPatchFields.C
 )
 
 set(basicPointPatchFields ${pointPatchFields}/basic)
-list(APPEND sources
+list(APPEND SOURCES
   ${basicPointPatchFields}/calculated/calculatedPointPatchFields.C
   ${basicPointPatchFields}/generic/genericPointPatchFields.C
   ${basicPointPatchFields}/coupled/coupledPointPatchFields.C
@@ -714,7 +714,7 @@ list(APPEND sources
 )
 
 set(constraintPointPatchFields ${pointPatchFields}/constraint)
-list(APPEND sources
+list(APPEND SOURCES
   ${constraintPointPatchFields}/empty/emptyPointPatchFields.C
   ${constraintPointPatchFields}/symmetry/symmetryPointPatchFields.C
   ${constraintPointPatchFields}/wedge/wedgePointPatchFields.C
@@ -723,7 +723,7 @@ list(APPEND sources
 )
 
 set(derivedPointPatchFields ${pointPatchFields}/derived)
-list(APPEND sources
+list(APPEND SOURCES
   ${derivedPointPatchFields}/slip/slipPointPatchFields.C
   ${derivedPointPatchFields}/global/globalPointPatchFields.C
   ${derivedPointPatchFields}/uniformFixedValue/uniformFixedValuePointPatchFields.C
@@ -736,7 +736,7 @@ list(APPEND sources
 
 set(interpolations interpolations)
 set(interpolation ${interpolations}/interpolation)
-list(APPEND sources
+list(APPEND SOURCES
   ${interpolations}/splineInterpolateXY/splineInterpolateXY.C
   ${interpolations}/patchToPatchInterpolation/PatchToPatchInterpolationName.C
   ${interpolations}/GGIInterpolation/GGIInterpolationName.C
@@ -756,7 +756,7 @@ list(APPEND sources
 )
 
 set(octree algorithms/octree/octree)
-list(APPEND sources
+list(APPEND SOURCES
   ${octree}/octreeName.C
   ${octree}/octreeDataPoint.C
   ${octree}/octreeDataPointTreeLeaf.C
@@ -771,7 +771,7 @@ list(APPEND sources
 )
 
 set(indexedOctree algorithms/octree/indexedOctree)
-list(APPEND sources
+list(APPEND SOURCES
   ${indexedOctree}/indexedOctreeName.C
   ${indexedOctree}/treeDataCell.C
   ${indexedOctree}/treeDataEdge.C
@@ -782,7 +782,7 @@ list(APPEND sources
 )
 
 set(writers graph/writers)
-list(APPEND sources
+list(APPEND SOURCES
   ${writers}/rawGraph/rawGraph.C
   ${writers}/gnuplotGraph/gnuplotGraph.C
   ${writers}/xmgrGraph/xmgrGraph.C
@@ -796,7 +796,7 @@ list(APPEND sources
 )
 
 set(BlockCoeffNorm primitives/BlockCoeff/BlockCoeffNorm)
-list(APPEND sources
+list(APPEND SOURCES
   ${BlockCoeffNorm}/BlockCoeffNorm/blockCoeffNorms.C
   ${BlockCoeffNorm}/BlockCoeffTwoNorm/blockCoeffTwoNorms.C
   ${BlockCoeffNorm}/BlockCoeffMaxNorm/blockCoeffMaxNorms.C
@@ -811,7 +811,7 @@ list(APPEND sources
 )
 
 set(BlockLduMatrix matrices/blockLduMatrix/BlockLduMatrix)
-list(APPEND sources
+list(APPEND SOURCES
   ${BlockLduMatrix}/blockLduMatrixName.C
   ${BlockLduMatrix}/scalarBlockLduMatrix.C
   ${BlockLduMatrix}/sphericalTensorBlockLduMatrix.C
@@ -826,7 +826,7 @@ list(APPEND sources
 )
 
 set(BlockLduInterfaceFields ${BlockLduMatrix}/BlockLduInterfaceFields)
-list(APPEND sources
+list(APPEND SOURCES
   ${BlockLduInterfaceFields}/BlockLduInterfaceField/BlockLduInterfaceFields.C
   ${BlockLduInterfaceFields}/BlockLduInterfaceField/blockVectorNLduInterfaceFields.C
   ${BlockLduInterfaceFields}/GGIBlockLduInterfaceField/GGIBlockLduInterfaceFields.C
@@ -836,13 +836,13 @@ list(APPEND sources
 )
 
 set(BlockAMG matrices/blockLduMatrix/BlockAMG)
-list(APPEND sources
+list(APPEND SOURCES
   ${BlockAMG}/blockAMGCycles.C
   ${BlockAMG}/blockAMGLevels.C
 )
 
 set(BlockAMGInterfaceFields ${BlockAMG}/BlockAMGInterfaceFields)
-list(APPEND sources
+list(APPEND SOURCES
   ${BlockAMGInterfaceFields}/BlockAMGInterfaceField/blockAMGInterfaceFields.C
   ${BlockAMGInterfaceFields}/BlockAMGInterfaceField/blockVectorNAMGInterfaceFields.C
   ${BlockAMGInterfaceFields}/ProcessorBlockAMGInterfaceField/ProcessorBlockAMGInterfaceFields.C
@@ -850,13 +850,13 @@ list(APPEND sources
 )
 
 set(BlockMatrixCoarsening ${BlockAMG}/BlockMatrixCoarsening)
-list(APPEND sources
+list(APPEND SOURCES
   ${BlockMatrixCoarsening}/BlockMatrixCoarsening/blockMatrixCoarsenings.C
   ${BlockMatrixCoarsening}/BlockMatrixAgglomeration/blockMatrixAgglomerations.C
 )
 
 set(BlockLduPrecons matrices/blockLduMatrix/BlockLduPrecons)
-list(APPEND sources
+list(APPEND SOURCES
   ${BlockLduPrecons}/BlockLduPrecon/blockLduPrecons.C
   ${BlockLduPrecons}/BlockNoPrecon/blockNoPrecons.C
   ${BlockLduPrecons}/BlockDiagonalPrecon/scalarBlockDiagonalPrecon.C
@@ -875,7 +875,7 @@ list(APPEND sources
 )
 
 set(BlockLduSmoothers matrices/blockLduMatrix/BlockLduSmoothers)
-list(APPEND sources
+list(APPEND SOURCES
   ${BlockLduSmoothers}/BlockLduSmoother/blockLduSmoothers.C
   ${BlockLduSmoothers}/BlockGaussSeidelSmoother/blockGaussSeidelSmoothers.C
   ${BlockLduSmoothers}/BlockILUSmoother/blockILUSmoothers.C
@@ -883,7 +883,7 @@ list(APPEND sources
 )
 
 set(BlockLduSolvers matrices/blockLduMatrix/BlockLduSolvers)
-list(APPEND sources
+list(APPEND SOURCES
   ${BlockLduSolvers}/blockVectorNSolvers.C
   ${BlockLduSolvers}/BlockLduSolver/blockLduSolvers.C
   ${BlockLduSolvers}/BlockDiagonal/blockDiagonalSolvers.C
@@ -895,9 +895,7 @@ list(APPEND sources
   ${BlockLduSolvers}/Segregated/segregatedSolvers.C
 )
 
-add_foam_library(foam SHARED ${sources})
+add_foam_library(foam SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(foam OSspecific mpi ZLIB::ZLIB)
 add_dependencies(foam getGitVersion)
diff --git a/src/foam/global/global.C b/src/foam/global/global.C
index e69de29bb..8ebb26dfe 100644
--- a/src/foam/global/global.C
+++ b/src/foam/global/global.C
@@ -0,0 +1,80 @@
+/*-------------------------------*- C++ -*-----------------------------------*\
+  =========                 |
+  \\      /  F ield         | foam-extend: Open Source CFD
+   \\    /   O peration     | Version:     3.2
+    \\  /    A nd           | Web:         http://www.foam-extend.org
+     \\/     M anipulation  | For copyright notice see file Copyright
+-------------------------------------------------------------------------------
+License
+    This file is part of foam-extend.
+
+    foam-extend is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    foam-extend is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+
+Description
+    Define the globals used in the OpenFOAM library.
+    It is important that these are constructed in the appropriate order to
+    avoid the use of unconstructed data in the global namespace.
+
+    This file has the extension .Cver to trigger a Makefile rule that converts
+    'VERSION\_STRING' and 'BUILD\_STRING' into the appropriate strings.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "foamVersion.H"
+
+const char* const Foam::FOAMversion = "v4.0-4-a743de9-dirty";
+const char* const Foam::FOAMbuild = "4.0";
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Setup an error handler for the global new operator
+
+#include "new.C"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Global IO streams
+
+#include "IOstreams.C"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "JobInfo.H"
+bool Foam::JobInfo::constructed = false;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Global error definitions (initialised by construction)
+
+#include "messageStream.C"
+#include "error.C"
+#include "IOerror.C"
+#include "token.C"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Read the debug and info switches
+
+#include "debug.C"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Read and set cell models
+
+#include "globalCellModeller.C"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Create the jobInfo file in the $FOAM_JOB_DIR/runningJobs directory
+
+#include "JobInfo.C"
+
+// ************************************************************************* //
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/CMakeLists.txt b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/CMakeLists.txt
index 7c66b3d12..0bb5427b1 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/CMakeLists.txt
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/CMakeLists.txt
@@ -30,13 +30,11 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   MGridGenGAMGAgglomeration.C
   MGridGenGAMGAgglomerate.C
 )
 
-add_foam_library(MGridGenGAMGAgglomeration SHARED ${sources})
+add_foam_library(MGridGenGAMGAgglomeration SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(MGridGenGAMGAgglomeration finiteVolume)
diff --git a/src/immersedBoundary/immersedBoundary/CMakeLists.txt b/src/immersedBoundary/immersedBoundary/CMakeLists.txt
index 082e04eed..08aa07ccc 100644
--- a/src/immersedBoundary/immersedBoundary/CMakeLists.txt
+++ b/src/immersedBoundary/immersedBoundary/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   immersedBoundaryPolyPatch/immersedBoundaryPolyPatch.C
   immersedBoundaryPointPatch/immersedBoundaryPointPatch.C
   immersedBoundaryFvPatch/immersedBoundaryFvPatch.C
@@ -44,8 +44,6 @@ list(APPEND sources
   ibSwirlFlowRateInletVelocity/ibSwirlFlowRateInletVelocityFvPatchVectorField.C
 )
 
-add_foam_library(immersedBoundary SHARED ${sources})
+add_foam_library(immersedBoundary SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(immersedBoundary PUBLIC finiteVolume sampling surfMesh dynamicMesh)
diff --git a/src/immersedBoundary/immersedBoundaryDynamicMesh/CMakeLists.txt b/src/immersedBoundary/immersedBoundaryDynamicMesh/CMakeLists.txt
index c397bc7de..8664bacf8 100644
--- a/src/immersedBoundary/immersedBoundaryDynamicMesh/CMakeLists.txt
+++ b/src/immersedBoundary/immersedBoundaryDynamicMesh/CMakeLists.txt
@@ -30,13 +30,11 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   movingImmersedBoundary/movingImmersedBoundary.C
   immersedBoundarySolidBodyMotionFvMesh/immersedBoundarySolidBodyMotionFvMesh.C
 )
 
-add_foam_library(immersedBoundaryDynamicFvMesh SHARED ${sources})
+add_foam_library(immersedBoundaryDynamicFvMesh SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(immersedBoundaryDynamicFvMesh PUBLIC immersedBoundary dynamicFvMesh solidBodyMotion)
diff --git a/src/immersedBoundary/immersedBoundaryForce/CMakeLists.txt b/src/immersedBoundary/immersedBoundaryForce/CMakeLists.txt
index a7289993d..34b9a3b02 100644
--- a/src/immersedBoundary/immersedBoundaryForce/CMakeLists.txt
+++ b/src/immersedBoundary/immersedBoundaryForce/CMakeLists.txt
@@ -30,13 +30,11 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   immersedBoundaryForces.C
   immersedBoundaryForcesFunctionObject.C
 )
 
-add_foam_library(immersedBoundaryForceFunctionObject SHARED ${sources})
+add_foam_library(immersedBoundaryForceFunctionObject SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(immersedBoundaryForceFunctionObject immersedBoundaryTurbulence forces)
diff --git a/src/immersedBoundary/immersedBoundaryTurbulence/CMakeLists.txt b/src/immersedBoundary/immersedBoundaryTurbulence/CMakeLists.txt
index 53a41eb68..0fe49dfb0 100644
--- a/src/immersedBoundary/immersedBoundaryTurbulence/CMakeLists.txt
+++ b/src/immersedBoundary/immersedBoundaryTurbulence/CMakeLists.txt
@@ -30,15 +30,13 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   wallFunctions/immersedBoundaryWallFunctions/immersedBoundaryWallFunctionFvPatchFields.C
   wallFunctions/immersedBoundaryEpsilonWallFunctions/immersedBoundaryEpsilonWallFunctionFvPatchScalarField.C
   wallFunctions/immersedBoundaryOmegaWallFunctions/immersedBoundaryOmegaWallFunctionFvPatchScalarField.C
   wallFunctions/immersedBoundaryVelocityWallFunctions/immersedBoundaryVelocityWallFunctionFvPatchVectorField.C
 )
 
-add_foam_library(immersedBoundaryTurbulence SHARED ${sources})
+add_foam_library(immersedBoundaryTurbulence SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(immersedBoundaryTurbulence immersedBoundary incompressibleRASModels incompressibleLESModels)
diff --git a/src/lagrangian/basic/CMakeLists.txt b/src/lagrangian/basic/CMakeLists.txt
index ea0cb8778..8fcd61953 100644
--- a/src/lagrangian/basic/CMakeLists.txt
+++ b/src/lagrangian/basic/CMakeLists.txt
@@ -35,13 +35,11 @@ set(particle particle)
 set(passiveParticle passiveParticle)
 set(indexedParticle indexedParticle)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${passiveParticle}/passiveParticleCloud.C
   ${indexedParticle}/indexedParticleCloud.C
 )
 
-add_foam_library(lagrangianBasic SHARED ${sources})
+add_foam_library(lagrangianBasic SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(lagrangianBasic PUBLIC decompositionMethods foam)
diff --git a/src/lagrangian/coalCombustion/CMakeLists.txt b/src/lagrangian/coalCombustion/CMakeLists.txt
index f9d94bce8..8632e339d 100644
--- a/src/lagrangian/coalCombustion/CMakeLists.txt
+++ b/src/lagrangian/coalCombustion/CMakeLists.txt
@@ -31,13 +31,11 @@
 # --------------------------------------------------------------------------
 
 #  Coal parcel and sub-models 
-list(APPEND sources
+list(APPEND SOURCES
   CoalParcel/defineCoalParcel.C
   CoalParcel/makeCoalParcelSubmodels.C
 )
 
-add_foam_library(coalCombustion SHARED ${sources})
+add_foam_library(coalCombustion SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(coalCombustion PUBLIC lagrangianBasic lagrangianIntermediate basicThermophysicalModels)
diff --git a/src/lagrangian/dieselSpray/CMakeLists.txt b/src/lagrangian/dieselSpray/CMakeLists.txt
index efab47550..bbd5c0ef0 100644
--- a/src/lagrangian/dieselSpray/CMakeLists.txt
+++ b/src/lagrangian/dieselSpray/CMakeLists.txt
@@ -44,7 +44,7 @@ set(collisionModels spraySubModels/collisionModel)
 set(dispersionModels spraySubModels/dispersionModel)
 set(injectorModels spraySubModels/injectorModel)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${parcel}/parcel.C
   ${parcel}/parcelFunctions.C
   ${parcel}/parcelIO.C
@@ -115,8 +115,6 @@ list(APPEND sources
   ${dispersionModels}/stochasticDispersionRAS/stochasticDispersionRAS.C
 )
 
-add_foam_library(dieselSpray SHARED ${sources})
+add_foam_library(dieselSpray SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(dieselSpray PUBLIC lagrangianBasic lagrangianIntermediate basicThermophysicalModels)
diff --git a/src/lagrangian/dsmc/CMakeLists.txt b/src/lagrangian/dsmc/CMakeLists.txt
index 60f742bee..b86810741 100644
--- a/src/lagrangian/dsmc/CMakeLists.txt
+++ b/src/lagrangian/dsmc/CMakeLists.txt
@@ -31,25 +31,23 @@
 # --------------------------------------------------------------------------
 
 #  Parcels 
-list(APPEND sources
+list(APPEND SOURCES
   parcels/derived/dsmcParcel/dsmcParcel.C
 )
 
 #  Cloud base classes 
-list(APPEND sources
+list(APPEND SOURCES
   clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.C
 )
 
 #  submodels 
-list(APPEND sources
+list(APPEND SOURCES
   parcels/derived/dsmcParcel/defineDsmcParcel.C
   parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C
   parcels/derived/dsmcParcel/makeDsmcParcelWallInteractionModels.C
   parcels/derived/dsmcParcel/makeDsmcParcelInflowBoundaryModels.C
 )
 
-add_foam_library(dsmc SHARED ${sources})
+add_foam_library(dsmc SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(dsmc finiteVolume lagrangianBasic)
diff --git a/src/lagrangian/intermediate/CMakeLists.txt b/src/lagrangian/intermediate/CMakeLists.txt
index 0c6365b37..7e3913416 100644
--- a/src/lagrangian/intermediate/CMakeLists.txt
+++ b/src/lagrangian/intermediate/CMakeLists.txt
@@ -40,13 +40,13 @@ set(DERIVEDCLOUDS ${CLOUDS}/derived)
 
 
 #  Parcels 
-list(APPEND sources
+list(APPEND SOURCES
   ${BASEPARCELS}/reactingParcel/reactingParcel.C
 )
 
 
 #  Cloud base classes 
-list(APPEND sources
+list(APPEND SOURCES
   ${BASECLOUDS}/kinematicCloud/kinematicCloud.C
   ${BASECLOUDS}/thermoCloud/thermoCloud.C
   ${BASECLOUDS}/reactingCloud/reactingCloud.C
@@ -56,7 +56,7 @@ list(APPEND sources
 
 #  kinematic parcel sub-models 
 set(KINEMATICPARCEL ${DERIVEDPARCELS}/basicKinematicParcel)
-list(APPEND sources
+list(APPEND SOURCES
   ${KINEMATICPARCEL}/basicKinematicParcel.C
   ${KINEMATICPARCEL}/defineBasicKinematicParcel.C
   ${KINEMATICPARCEL}/makeBasicKinematicParcelSubmodels.C
@@ -65,7 +65,7 @@ list(APPEND sources
 
 #  thermo parcel sub-models 
 set(THERMOPARCEL ${DERIVEDPARCELS}/basicThermoParcel)
-list(APPEND sources
+list(APPEND SOURCES
   ${THERMOPARCEL}/basicThermoParcel.C
   ${THERMOPARCEL}/defineBasicThermoParcel.C
   ${THERMOPARCEL}/makeBasicThermoParcelSubmodels.C
@@ -74,7 +74,7 @@ list(APPEND sources
 
 #  reacting parcel sub-models 
 set(REACTINGPARCEL ${DERIVEDPARCELS}/BasicReactingParcel)
-list(APPEND sources
+list(APPEND SOURCES
   ${REACTINGPARCEL}/defineBasicReactingParcel.C
   ${REACTINGPARCEL}/makeBasicReactingParcelSubmodels.C
 )
@@ -82,7 +82,7 @@ list(APPEND sources
 
 #  reacting multiphase parcel sub-models 
 set(REACTINGMPPARCEL ${DERIVEDPARCELS}/BasicReactingMultiphaseParcel)
-list(APPEND sources
+list(APPEND SOURCES
   ${REACTINGMPPARCEL}/defineBasicReactingMultiphaseParcel.C
   ${REACTINGMPPARCEL}/makeBasicReactingMultiphaseParcelSubmodels.C
 )
@@ -90,35 +90,35 @@ list(APPEND sources
 
 #  bolt-on models 
 set(RADIATION submodels/addOns/radiation)
-list(APPEND sources
+list(APPEND SOURCES
   ${RADIATION}/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
   ${RADIATION}/scatter/cloudScatter/cloudScatter.C
   submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C
 )
 
 set(KINEMATICINJECTION submodels/Kinematic/InjectionModel)
-list(APPEND sources
+list(APPEND SOURCES
   ${KINEMATICINJECTION}/KinematicLookupTableInjection/kinematicParcelInjectionData.C
   ${KINEMATICINJECTION}/KinematicLookupTableInjection/kinematicParcelInjectionDataIO.C
   ${KINEMATICINJECTION}/KinematicLookupTableInjection/kinematicParcelInjectionDataIOList.C
 )
 
 set(THERMOINJECTION submodels/Thermodynamic/InjectionModel)
-list(APPEND sources
+list(APPEND SOURCES
   ${THERMOINJECTION}/ThermoLookupTableInjection/thermoParcelInjectionData.C
   ${THERMOINJECTION}/ThermoLookupTableInjection/thermoParcelInjectionDataIO.C
   ${THERMOINJECTION}/ThermoLookupTableInjection/thermoParcelInjectionDataIOList.C
 )
 
 set(REACTINGINJECTION submodels/Reacting/InjectionModel)
-list(APPEND sources
+list(APPEND SOURCES
   ${REACTINGINJECTION}/ReactingLookupTableInjection/reactingParcelInjectionData.C
   ${REACTINGINJECTION}/ReactingLookupTableInjection/reactingParcelInjectionDataIO.C
   ${REACTINGINJECTION}/ReactingLookupTableInjection/reactingParcelInjectionDataIOList.C
 )
 
 set(REACTINGMPINJECTION submodels/ReactingMultiphase/InjectionModel)
-list(APPEND sources
+list(APPEND SOURCES
   ${REACTINGMPINJECTION}/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionData.C
   ${REACTINGMPINJECTION}/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIO.C
   ${REACTINGMPINJECTION}/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIOList.C
@@ -126,7 +126,7 @@ list(APPEND sources
 
 
 #  data entries 
-list(APPEND sources
+list(APPEND SOURCES
   submodels/IO/DataEntry/makeDataEntries.C
   submodels/IO/DataEntry/polynomial/polynomial.C
   submodels/IO/DataEntry/polynomial/polynomialIO.C
@@ -134,26 +134,24 @@ list(APPEND sources
 
 
 #  integration schemes 
-list(APPEND sources
+list(APPEND SOURCES
   IntegrationScheme/makeIntegrationSchemes.C
 )
 
 
 #  particle forces 
-list(APPEND sources
+list(APPEND SOURCES
   particleForces/particleForces.C
 )
 
 
 #  phase properties 
-list(APPEND sources
+list(APPEND SOURCES
   phaseProperties/phaseProperties/phaseProperties.C
   phaseProperties/phaseProperties/phasePropertiesIO.C
   phaseProperties/phasePropertiesList/phasePropertiesList.C
 )
 
-add_foam_library(lagrangianIntermediate SHARED ${sources})
+add_foam_library(lagrangianIntermediate SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(lagrangianIntermediate PUBLIC reactionThermophysicalModels radiation compressibleRASModels compressibleLESModels pdf liquidMixture solidMixture)
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/CMakeLists.txt b/src/lagrangian/molecularDynamics/molecularMeasurements/CMakeLists.txt
index 21a7bd6bf..b4856f2e1 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/CMakeLists.txt
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/CMakeLists.txt
@@ -30,12 +30,10 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   distribution/distribution.C
 )
 
-add_foam_library(molecularMeasurements SHARED ${sources})
+add_foam_library(molecularMeasurements SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(molecularMeasurements PUBLIC foam)
diff --git a/src/lagrangian/molecularDynamics/molecule/CMakeLists.txt b/src/lagrangian/molecularDynamics/molecule/CMakeLists.txt
index beced323d..d4544c032 100644
--- a/src/lagrangian/molecularDynamics/molecule/CMakeLists.txt
+++ b/src/lagrangian/molecularDynamics/molecule/CMakeLists.txt
@@ -37,7 +37,7 @@ set(referredCell ${interactionLists}/referredCell)
 set(referralLists ${interactionLists}/referralLists)
 set(directInteractionList ${interactionLists}/directInteractionList)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${referralLists}/sendingReferralList.C
   ${referralLists}/receivingReferralList.C
   ${referredCellList}/referredCellList.C
@@ -48,24 +48,22 @@ list(APPEND sources
 )
 
 set(reducedUnits reducedUnits)
-list(APPEND sources
+list(APPEND SOURCES
   ${reducedUnits}/reducedUnits.C
   ${reducedUnits}/reducedUnitsIO.C
 )
 
 set(molecule molecule)
-list(APPEND sources
+list(APPEND SOURCES
   ${molecule}/molecule.C
   ${molecule}/moleculeIO.C
 )
 
 set(moleculeCloud moleculeCloud)
-list(APPEND sources
+list(APPEND SOURCES
   ${moleculeCloud}/moleculeCloud.C
 )
 
-add_foam_library(molecule SHARED ${sources})
+add_foam_library(molecule SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(molecule PUBLIC potential)
diff --git a/src/lagrangian/molecularDynamics/potential/CMakeLists.txt b/src/lagrangian/molecularDynamics/potential/CMakeLists.txt
index 2e526b2a5..72d0664e7 100644
--- a/src/lagrangian/molecularDynamics/potential/CMakeLists.txt
+++ b/src/lagrangian/molecularDynamics/potential/CMakeLists.txt
@@ -32,13 +32,13 @@
 
 set(potential potential)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${potential}/potential.C
 )
 
 set(pairPotential pairPotential)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${pairPotential}/pairPotentialList/pairPotentialList.C
   ${pairPotential}/basic/pairPotential.C
   ${pairPotential}/basic/pairPotentialIO.C
@@ -54,7 +54,7 @@ list(APPEND sources
 
 set(energyScalingFunction energyScalingFunction)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${energyScalingFunction}/basic/energyScalingFunction.C
   ${energyScalingFunction}/basic/newEnergyScalingFunction.C
   ${energyScalingFunction}/derived/shifted/shifted.C
@@ -66,7 +66,7 @@ list(APPEND sources
 
 set(tetherPotential tetherPotential)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${tetherPotential}/tetherPotentialList/tetherPotentialList.C
   ${tetherPotential}/basic/tetherPotential.C
   ${tetherPotential}/basic/newTetherPotential.C
@@ -77,12 +77,10 @@ list(APPEND sources
 
 set(electrostaticPotential electrostaticPotential)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${electrostaticPotential}/electrostaticPotential.C
 )
 
-add_foam_library(potential SHARED ${sources})
+add_foam_library(potential SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(potential PUBLIC finiteVolume)
diff --git a/src/lagrangian/solidParticle/CMakeLists.txt b/src/lagrangian/solidParticle/CMakeLists.txt
index 0f5452971..6088b39c0 100644
--- a/src/lagrangian/solidParticle/CMakeLists.txt
+++ b/src/lagrangian/solidParticle/CMakeLists.txt
@@ -30,14 +30,12 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   solidParticle.C
   solidParticleIO.C
   solidParticleCloud.C
 )
 
-add_foam_library(solidParticle SHARED ${sources})
+add_foam_library(solidParticle SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(solidParticle PUBLIC finiteVolume lagrangianBasic)
diff --git a/src/lduSolvers/CMakeLists.txt b/src/lduSolvers/CMakeLists.txt
index 1bcee23de..e6350938f 100644
--- a/src/lduSolvers/CMakeLists.txt
+++ b/src/lduSolvers/CMakeLists.txt
@@ -30,13 +30,13 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   crMatrix/crAddressing.C
   crMatrix/crMatrix.C
 )
 
 set(lduPrecon lduPrecon)
-list(APPEND sources
+list(APPEND SOURCES
   ${lduPrecon}/CholeskyPrecon/CholeskyPrecon.C
   ${lduPrecon}/ILU0/ILU0.C
   ${lduPrecon}/ILUC0/ILUC0.C
@@ -46,13 +46,13 @@ list(APPEND sources
 )
 
 set(lduSmoother lduSmoother)
-list(APPEND sources
+list(APPEND SOURCES
   ${lduSmoother}/symGaussSeidelSmoother/symGaussSeidelSmoother.C
   ${lduSmoother}/iluSmoother/iluSmoother.C
 )
 
 set(lduSolver lduSolver)
-list(APPEND sources
+list(APPEND SOURCES
   ${lduSolver}/cgSolver/cgSolver.C
   ${lduSolver}/bicgSolver/bicgSolver.C
   ${lduSolver}/bicgStabSolver/bicgStabSolver.C
@@ -65,20 +65,18 @@ list(APPEND sources
 )
 
 set(amg amg)
-list(APPEND sources
+list(APPEND SOURCES
   ${amg}/amgCycle.C
   ${amg}/fineAmgLevel.C
   ${amg}/coarseAmgLevel.C
 )
 
 set(amgPolicy ${amg}/amgPolicy)
-list(APPEND sources
+list(APPEND SOURCES
   ${amgPolicy}/amgPolicy.C
   ${amgPolicy}/pamgPolicy.C
 )
 
-add_foam_library(lduSolvers SHARED ${sources})
+add_foam_library(lduSolvers SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(lduSolvers PUBLIC foam)
diff --git a/src/mesh/autoMesh/CMakeLists.txt b/src/mesh/autoMesh/CMakeLists.txt
index cd9653042..300cd32bc 100644
--- a/src/mesh/autoMesh/CMakeLists.txt
+++ b/src/mesh/autoMesh/CMakeLists.txt
@@ -33,7 +33,7 @@
 set(autoHexMesh autoHexMesh)
 set(autoHexMeshDriver ${autoHexMesh}/autoHexMeshDriver)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${autoHexMeshDriver}/autoLayerDriver.C
   ${autoHexMeshDriver}/autoLayerDriverShrink.C
   ${autoHexMeshDriver}/autoSnapDriver.C
@@ -54,8 +54,6 @@ list(APPEND sources
   ${autoHexMesh}/trackedParticle/trackedParticleCloud.C
 )
 
-add_foam_library(autoMesh SHARED ${sources})
+add_foam_library(autoMesh SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(autoMesh PUBLIC dynamicFvMesh edgeMesh)
diff --git a/src/mesh/blockMesh/CMakeLists.txt b/src/mesh/blockMesh/CMakeLists.txt
index a08320fd5..8846be105 100644
--- a/src/mesh/blockMesh/CMakeLists.txt
+++ b/src/mesh/blockMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   curvedEdges/BSpline.C
   curvedEdges/CatmullRomSpline.C
   curvedEdges/polyLine.C
@@ -52,8 +52,6 @@ list(APPEND sources
   blockMesh/blockMeshMerge.C
 )
 
-add_foam_library(blockMeshLib SHARED ${sources})
+add_foam_library(blockMeshLib SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(blockMeshLib PUBLIC ODE dynamicMesh finiteVolume meshTools)
diff --git a/src/mesh/cfMesh/CMakeLists.txt b/src/mesh/cfMesh/CMakeLists.txt
index 48ce556ae..897797a62 100644
--- a/src/mesh/cfMesh/CMakeLists.txt
+++ b/src/mesh/cfMesh/CMakeLists.txt
@@ -173,7 +173,7 @@ set(voronoiMeshGenerator voronoiMesh/voronoiMeshGenerator)
 
 set(workflowControls utilities/workflowControls)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${checkMeshDict}/checkMeshDict.C
   ${lists}/pointFieldPMG.C
   ${lists}/faceListPMG.C
@@ -421,8 +421,6 @@ list(APPEND sources
   ${workflowControls}/workflowControls.C
 )
 
-add_foam_library(cfMesh SHARED ${sources})
+add_foam_library(cfMesh SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(cfMesh PUBLIC meshTools edgeMesh)
diff --git a/src/mesh/extrudeModel/CMakeLists.txt b/src/mesh/extrudeModel/CMakeLists.txt
index a02c10bf9..e7c237ad3 100644
--- a/src/mesh/extrudeModel/CMakeLists.txt
+++ b/src/mesh/extrudeModel/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   extrudeModel/extrudeModel.C
   extrudeModel/newExtrudeModel.C
   linearNormal/linearNormal.C
@@ -39,8 +39,6 @@ list(APPEND sources
   wedge/wedge.C
 )
 
-add_foam_library(extrudeModel SHARED ${sources})
+add_foam_library(extrudeModel SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(extrudeModel PUBLIC dynamicMesh)
diff --git a/src/meshTools/CMakeLists.txt b/src/meshTools/CMakeLists.txt
index ea7f51f3c..abdbd8925 100644
--- a/src/meshTools/CMakeLists.txt
+++ b/src/meshTools/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   cellClassification/cellClassification.C
   cellClassification/cellInfo.C
   cellQuality/cellQuality.C
@@ -48,7 +48,7 @@ list(APPEND sources
 )
 
 set(searchableSurface searchableSurface)
-list(APPEND sources
+list(APPEND SOURCES
   ${searchableSurface}/distributedTriSurfaceMesh.C
   ${searchableSurface}/searchableBox.C
   ${searchableSurface}/searchableCylinder.C
@@ -64,7 +64,7 @@ list(APPEND sources
 )
 
 set(topoSets sets/topoSets)
-list(APPEND sources
+list(APPEND SOURCES
   ${topoSets}/cellSet.C
   ${topoSets}/topoSet.C
   ${topoSets}/faceSet.C
@@ -73,7 +73,7 @@ list(APPEND sources
 )
 
 set(cellSources sets/cellSources)
-list(APPEND sources
+list(APPEND SOURCES
   ${cellSources}/faceToCell/faceToCell.C
   ${cellSources}/fieldToCell/fieldToCell.C
   ${cellSources}/pointToCell/pointToCell.C
@@ -94,7 +94,7 @@ list(APPEND sources
 )
 
 set(faceSources sets/faceSources)
-list(APPEND sources
+list(APPEND SOURCES
   ${faceSources}/faceToFace/faceToFace.C
   ${faceSources}/labelToFace/labelToFace.C
   ${faceSources}/cellToFace/cellToFace.C
@@ -109,7 +109,7 @@ list(APPEND sources
 )
 
 set(pointSources sets/pointSources)
-list(APPEND sources
+list(APPEND SOURCES
   ${pointSources}/labelToPoint/labelToPoint.C
   ${pointSources}/pointToPoint/pointToPoint.C
   ${pointSources}/cellToPoint/cellToPoint.C
@@ -123,7 +123,7 @@ list(APPEND sources
 )
 
 set(triSurfaceInterfaces triSurface/triSurface/interfaces)
-list(APPEND sources
+list(APPEND SOURCES
   triSurface/triSurface/triSurface.C
   triSurface/triSurface/triSurfaceAddressing.C
   triSurface/triSurface/stitchTriangles.C
@@ -143,8 +143,8 @@ list(APPEND sources
 )
 FLEX_TARGET(readSTLASCII ${triSurfaceInterfaces}/STL/readSTLASCII.L
   ${CMAKE_CURRENT_BINARY_DIR}/readSTLASCII.C COMPILE_FLAGS "-+")
-list(APPEND sources ${FLEX_readSTLASCII_OUTPUTS})
-list(APPEND sources
+list(APPEND SOURCES ${FLEX_readSTLASCII_OUTPUTS})
+list(APPEND SOURCES
   ${triSurfaceInterfaces}/STL/readSTLBINARY.C
   ${triSurfaceInterfaces}/GTS/writeGTS.C
   ${triSurfaceInterfaces}/GTS/readGTS.C
@@ -166,19 +166,19 @@ list(APPEND sources
 set(booleanOps triSurface/booleanOps)
 
 set(surfaceIntersection ${booleanOps}/surfaceIntersection)
-list(APPEND sources
+list(APPEND SOURCES
   ${surfaceIntersection}/surfaceIntersection.C
   ${surfaceIntersection}/surfaceIntersectionFuncs.C
   ${surfaceIntersection}/edgeIntersections.C
 )
 
 set(booleanSurface ${booleanOps}/booleanSurface)
-list(APPEND sources
+list(APPEND SOURCES
   ${booleanSurface}/booleanSurface.C
 )
 
 set(intersectedSurface ${booleanOps}/intersectedSurface)
-list(APPEND sources
+list(APPEND SOURCES
   ${intersectedSurface}/intersectedSurface.C
   ${intersectedSurface}/edgeSurface.C
   triSurface/triSurfaceSearch/triSurfaceSearch.C
@@ -195,8 +195,6 @@ list(APPEND sources
   directMapped/directMappedPointPatch/directMappedWallPointPatch.C
 )
 
-add_foam_library(meshTools SHARED ${sources})
+add_foam_library(meshTools SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(meshTools PUBLIC lagrangianBasic decompositionMethods)
diff --git a/src/multiSolver/CMakeLists.txt b/src/multiSolver/CMakeLists.txt
index 5c7470f83..fefccc1be 100644
--- a/src/multiSolver/CMakeLists.txt
+++ b/src/multiSolver/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   dummyControlDict/dummyControlDict.C
   multiTime/multiTime.C
   multiSolver/multiSolver.C
@@ -38,8 +38,6 @@ list(APPEND sources
   timeCluster/timeClusterList.C
 )
 
-add_foam_library(multiSolverLib SHARED ${sources})
+add_foam_library(multiSolverLib SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(multiSolverLib PUBLIC foam)
diff --git a/src/postProcessing/foamCalcFunctions/CMakeLists.txt b/src/postProcessing/foamCalcFunctions/CMakeLists.txt
index ef1e097ff..7a7bc16fd 100644
--- a/src/postProcessing/foamCalcFunctions/CMakeLists.txt
+++ b/src/postProcessing/foamCalcFunctions/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   calcType/calcType.C
   calcType/newCalcType.C
   field/domainIntegrate/domainIntegrate.C
@@ -46,8 +46,6 @@ list(APPEND sources
   basic/scalarMult/scalarMult.C
 )
 
-add_foam_library(foamCalcFunctions SHARED ${sources})
+add_foam_library(foamCalcFunctions SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(foamCalcFunctions PUBLIC finiteVolume)
diff --git a/src/postProcessing/functionObjects/IO/CMakeLists.txt b/src/postProcessing/functionObjects/IO/CMakeLists.txt
index ad793ace6..e784b6c5e 100644
--- a/src/postProcessing/functionObjects/IO/CMakeLists.txt
+++ b/src/postProcessing/functionObjects/IO/CMakeLists.txt
@@ -30,13 +30,11 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   writeRegisteredObject/writeRegisteredObject.C
   writeRegisteredObject/writeRegisteredObjectFunctionObject.C
 )
 
-add_foam_library(IOFunctionObjects SHARED ${sources})
+add_foam_library(IOFunctionObjects SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(IOFunctionObjects PUBLIC foam)
diff --git a/src/postProcessing/functionObjects/check/CMakeLists.txt b/src/postProcessing/functionObjects/check/CMakeLists.txt
index f61c13408..2cb77dac6 100644
--- a/src/postProcessing/functionObjects/check/CMakeLists.txt
+++ b/src/postProcessing/functionObjects/check/CMakeLists.txt
@@ -30,14 +30,12 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   ggiCheck/ggiCheckFunctionObject.C
   meshCheck/meshCheckFunctionObject.C
   mixingPlaneCheck/mixingPlaneCheckFunctionObject.C
 )
 
-add_foam_library(checkFunctionObjects SHARED ${sources})
+add_foam_library(checkFunctionObjects SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(checkFunctionObjects PUBLIC finiteVolume)
diff --git a/src/postProcessing/functionObjects/field/CMakeLists.txt b/src/postProcessing/functionObjects/field/CMakeLists.txt
index 591142028..456b63e5a 100644
--- a/src/postProcessing/functionObjects/field/CMakeLists.txt
+++ b/src/postProcessing/functionObjects/field/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   fieldAverage/fieldAverage/fieldAverage.C
   fieldAverage/fieldAverageItem/fieldAverageItem.C
   fieldAverage/fieldAverageItem/fieldAverageItemIO.C
@@ -50,8 +50,6 @@ list(APPEND sources
   surfaceInterpolateFields/surfaceInterpolateFields.C
 )
 
-add_foam_library(fieldFunctionObjects SHARED ${sources})
+add_foam_library(fieldFunctionObjects SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(fieldFunctionObjects PUBLIC finiteVolume)
diff --git a/src/postProcessing/functionObjects/forces/CMakeLists.txt b/src/postProcessing/functionObjects/forces/CMakeLists.txt
index 8853a7d5e..8baa1907a 100644
--- a/src/postProcessing/functionObjects/forces/CMakeLists.txt
+++ b/src/postProcessing/functionObjects/forces/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   forces/forces.C
   forces/forcesFunctionObject.C
   forceCoeffs/forceCoeffs.C
@@ -39,7 +39,7 @@ list(APPEND sources
 
 set(sDoFRBM pointPatchFields/derived/sixDoFRigidBodyMotion)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${sDoFRBM}/sixDoFRigidBodyMotion.C
   ${sDoFRBM}/sixDoFRigidBodyMotionIO.C
   ${sDoFRBM}/sixDoFRigidBodyMotionState.C
@@ -48,7 +48,7 @@ list(APPEND sources
 
 set(sDoFRBMR ${sDoFRBM}/sixDoFRigidBodyMotionRestraint)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${sDoFRBMR}/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C
   ${sDoFRBMR}/sixDoFRigidBodyMotionRestraint/newSixDoFRigidBodyMotionRestraint.C
   ${sDoFRBMR}/linearAxialAngularSpring/linearAxialAngularSpring.C
@@ -59,7 +59,7 @@ list(APPEND sources
 
 set(sDoFRBMC ${sDoFRBM}/sixDoFRigidBodyMotionConstraint)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${sDoFRBMC}/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C
   ${sDoFRBMC}/sixDoFRigidBodyMotionConstraint/newSixDoFRigidBodyMotionConstraint.C
   ${sDoFRBMC}/fixedAxis/fixedAxis.C
@@ -71,8 +71,6 @@ list(APPEND sources
   pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
 )
 
-add_foam_library(forces SHARED ${sources})
+add_foam_library(forces SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(forces PUBLIC incompressibleRASModels incompressibleLESModels compressibleRASModels compressibleLESModels)
diff --git a/src/postProcessing/functionObjects/systemCall/CMakeLists.txt b/src/postProcessing/functionObjects/systemCall/CMakeLists.txt
index a97d2cbfb..1a9f39aee 100644
--- a/src/postProcessing/functionObjects/systemCall/CMakeLists.txt
+++ b/src/postProcessing/functionObjects/systemCall/CMakeLists.txt
@@ -30,13 +30,11 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   systemCall.C
   systemCallFunctionObject.C
 )
 
-add_foam_library(systemCall SHARED ${sources})
+add_foam_library(systemCall SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(systemCall PUBLIC foam)
diff --git a/src/postProcessing/functionObjects/utilities/CMakeLists.txt b/src/postProcessing/functionObjects/utilities/CMakeLists.txt
index 202d7b281..d4fe277e4 100644
--- a/src/postProcessing/functionObjects/utilities/CMakeLists.txt
+++ b/src/postProcessing/functionObjects/utilities/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   staticPressure/staticPressure.C
   staticPressure/staticPressureFunctionObject.C
   dsmcFields/dsmcFields.C
@@ -39,8 +39,6 @@ list(APPEND sources
   divFlux/divFlux.C
 )
 
-add_foam_library(utilityFunctionObjects SHARED ${sources})
+add_foam_library(utilityFunctionObjects SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(utilityFunctionObjects PUBLIC basicThermophysicalModels sampling dsmc)
diff --git a/src/postProcessing/postCalc/CMakeLists.txt b/src/postProcessing/postCalc/CMakeLists.txt
index fa68d7a4f..38ca43219 100644
--- a/src/postProcessing/postCalc/CMakeLists.txt
+++ b/src/postProcessing/postCalc/CMakeLists.txt
@@ -30,12 +30,10 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   postCalc.C
 )
 
-add_foam_library(postCalc SHARED ${sources})
+add_foam_library(postCalc SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(postCalc PUBLIC finiteVolume)
diff --git a/src/randomProcesses/CMakeLists.txt b/src/randomProcesses/CMakeLists.txt
index d8544e9da..2a7e511f6 100644
--- a/src/randomProcesses/CMakeLists.txt
+++ b/src/randomProcesses/CMakeLists.txt
@@ -41,7 +41,7 @@ set(turbulence turbulence)
 
 set(noise noise)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${Kmesh}/Kmesh.C
   ${fft}/fft.C
   ${fft}/fftRenumber.C
@@ -52,8 +52,6 @@ list(APPEND sources
   ${noise}/noiseFFT.C
 )
 
-add_foam_library(randomProcesses SHARED ${sources})
+add_foam_library(randomProcesses SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(randomProcesses PUBLIC finiteVolume)
diff --git a/src/sampling/CMakeLists.txt b/src/sampling/CMakeLists.txt
index 987300483..c478e7357 100644
--- a/src/sampling/CMakeLists.txt
+++ b/src/sampling/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   probes/probes.C
   probes/probesFunctionObject.C
   sampledSet/coordSet/coordSet.C
@@ -47,7 +47,7 @@ list(APPEND sources
 
 set(setWriters sampledSet/writers)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${setWriters}/writers.C
   ${setWriters}/gnuplot/gnuplotSetWriterRunTime.C
   ${setWriters}/jplot/jplotSetWriterRunTime.C
@@ -72,7 +72,7 @@ list(APPEND sources
 
 set(surfWriters sampledSurface/writers)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${surfWriters}/surfaceWriters.C
   ${surfWriters}/dx/dxSurfaceWriterRunTime.C
   ${surfWriters}/foamFile/foamFileSurfaceWriterRunTime.C
@@ -86,14 +86,12 @@ list(APPEND sources
 )
 
 set(meshToMesh meshToMeshInterpolation/meshToMesh)
-list(APPEND sources
+list(APPEND SOURCES
   ${meshToMesh}/meshToMesh.C
   ${meshToMesh}/calculateMeshToMeshAddressing.C
   ${meshToMesh}/calculateMeshToMeshWeights.C
 )
 
-add_foam_library(sampling SHARED ${sources})
+add_foam_library(sampling SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(sampling PUBLIC finiteVolume surfMesh)
diff --git a/src/solidModels/CMakeLists.txt b/src/solidModels/CMakeLists.txt
index 4f5261d9b..9ed6d7acb 100644
--- a/src/solidModels/CMakeLists.txt
+++ b/src/solidModels/CMakeLists.txt
@@ -31,7 +31,7 @@
 # --------------------------------------------------------------------------
 
 set(arbitraryCrack arbitraryCrack)
-list(APPEND sources
+list(APPEND SOURCES
   ${arbitraryCrack}/faceCracker/faceCracker.C
   ${arbitraryCrack}/faceCracker/detachFaceCracker.C
   ${arbitraryCrack}/crackerFvMesh/crackerFvMesh.C
@@ -41,7 +41,7 @@ list(APPEND sources
 )
 
 set(boundaryConditions fvPatchFields)
-list(APPEND sources
+list(APPEND SOURCES
   ${boundaryConditions}/analyticalPlateHoleTraction/analyticalPlateHoleTractionFvPatchVectorField.C
   ${boundaryConditions}/fixedDisplacement/fixedDisplacementFvPatchVectorField.C
   ${boundaryConditions}/fixedDisplacementFixedRotation/fixedDisplacementFixedRotationFvPatchVectorField.C
@@ -60,7 +60,7 @@ list(APPEND sources
 )
 
 set(contactModels contactModels)
-list(APPEND sources
+list(APPEND SOURCES
   ${contactModels}/normalContactModels/normalContactModel/normalContactModel.C
   ${contactModels}/normalContactModels/normalContactModel/newNormalContactModel.C
   ${contactModels}/normalContactModels/iterativePenalty/iterativePenalty.C
@@ -78,7 +78,7 @@ list(APPEND sources
 )
 
 set(constitutiveModel constitutiveModel)
-list(APPEND sources
+list(APPEND SOURCES
   ${constitutiveModel}/constitutiveModel.C
   ${constitutiveModel}/plasticityStressReturnMethods/plasticityStressReturn/plasticityStressReturn.C
   ${constitutiveModel}/plasticityStressReturnMethods/plasticityStressReturn/newPlasticityStressReturn.C
@@ -97,7 +97,7 @@ list(APPEND sources
 )
 
 set(cohesiveLaws ${constitutiveModel}/cohesiveLaws)
-list(APPEND sources
+list(APPEND SOURCES
   ${cohesiveLaws}/cohesiveLaw/cohesiveLaw.C
   ${cohesiveLaws}/cohesiveLaw/newCohesiveLaw.C
   ${cohesiveLaws}/multiMaterialCohesiveLaw/multiMaterialCohesiveLaw.C
@@ -106,14 +106,14 @@ list(APPEND sources
 )
 
 set(finiteVolume finiteVolume)
-list(APPEND sources
+list(APPEND SOURCES
   ${finiteVolume}/gradSchemes/leastSquaresSolidInterfaceGrad/leastSquaresSolidInterfaceGrads.C
   ${finiteVolume}/gradSchemes/leastSquaresSolidInterfaceGrad/leastSquaresSolidInterfaceVectors.C
   nonLinearGeometry/nonLinearGeometry.C
 )
 
 set(rheologyLaws ${constitutiveModel}/rheologyLaws)
-list(APPEND sources
+list(APPEND SOURCES
   ${rheologyLaws}/rheologyLaw/rheologyLaw.C
   ${rheologyLaws}/rheologyLaw/newRheologyLaw.C
   ${rheologyLaws}/linearElastic/linearElastic.C
@@ -125,15 +125,13 @@ list(APPEND sources
   thermalModel/thermalModel.C
 )
 set(thermalLaws thermalModel/thermalLaws)
-list(APPEND sources
+list(APPEND SOURCES
   ${thermalLaws}/thermalLaw/thermalLaw.C
   ${thermalLaws}/thermalLaw/newThermalLaw.C
   ${thermalLaws}/constantThermal/constantThermal.C
   ${thermalLaws}/multiMaterialThermal/multiMaterialThermal.C
 )
 
-add_foam_library(solidModels SHARED ${sources})
+add_foam_library(solidModels SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(solidModels PUBLIC topoChangerFvMesh finiteArea)
diff --git a/src/surfMesh/CMakeLists.txt b/src/surfMesh/CMakeLists.txt
index 5ca73201a..3155ce35c 100644
--- a/src/surfMesh/CMakeLists.txt
+++ b/src/surfMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfZone/surfZone/surfZone.C
   surfZone/surfZone/surfZoneIOList.C
   surfZone/surfZoneIdentifier/surfZoneIdentifier.C
@@ -48,7 +48,7 @@ list(APPEND sources
 )
 
 set(surfaceFormats surfaceFormats)
-list(APPEND sources
+list(APPEND SOURCES
   ${surfaceFormats}/surfaceFormatsCore.C
   ${surfaceFormats}/ac3d/AC3DsurfaceFormatCore.C
   ${surfaceFormats}/ac3d/AC3DsurfaceFormatRunTime.C
@@ -68,8 +68,8 @@ list(APPEND sources
 )
 FLEX_TARGET(STLsurfaceFormatASCII ${surfaceFormats}/stl/STLsurfaceFormatASCII.L
   ${CMAKE_CURRENT_BINARY_DIR}/STLsurfaceFormatASCII.C COMPILE_FLAGS "-+")
-list(APPEND sources ${FLEX_STLsurfaceFormatASCII_OUTPUTS})
-list(APPEND sources
+list(APPEND SOURCES ${FLEX_STLsurfaceFormatASCII_OUTPUTS})
+list(APPEND SOURCES
   ${surfaceFormats}/tri/TRIsurfaceFormatCore.C
   ${surfaceFormats}/tri/TRIsurfaceFormatRunTime.C
   ${surfaceFormats}/vtk/VTKsurfaceFormatCore.C
@@ -80,8 +80,6 @@ list(APPEND sources
   ${surfaceFormats}/x3d/X3DsurfaceFormatRunTime.C
 )
 
-add_foam_library(surfMesh SHARED ${sources})
+add_foam_library(surfMesh SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(surfMesh foam)
diff --git a/src/tetFiniteElement/CMakeLists.txt b/src/tetFiniteElement/CMakeLists.txt
index 433d7790d..d62828ced 100644
--- a/src/tetFiniteElement/CMakeLists.txt
+++ b/src/tetFiniteElement/CMakeLists.txt
@@ -55,7 +55,7 @@ set(MapTetFemFields ${tetPolyMesh}/MapTetFemFields)
 
 set(tetPolyPatchInterpolation tetPolyPatchInterpolation)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${tetPolyPatch}/tetPolyPatch.C
   ${faceTetPolyPatch}/faceTetPolyPatch.C
   ${faceTetPolyPatch}/newFaceTetPolyPatch.C
@@ -88,12 +88,12 @@ list(APPEND sources
 )
 
 set(tetPolyPatchFields fields/tetPolyPatchFields)
-list(APPEND sources
+list(APPEND SOURCES
   ${tetPolyPatchFields}/tetPolyPatchField/tetPolyPatchFields.C
 )
 
 set(basicTetPolyPatchFields ${tetPolyPatchFields}/basic)
-list(APPEND sources
+list(APPEND SOURCES
   ${basicTetPolyPatchFields}/calculated/calculatedTetPolyPatchFields.C
   ${basicTetPolyPatchFields}/coupled/coupledTetPolyPatchFields.C
   ${basicTetPolyPatchFields}/coupledFace/coupledFaceTetPolyPatchFields.C
@@ -105,7 +105,7 @@ list(APPEND sources
 )
 
 set(constraintTetPolyPatchFields ${tetPolyPatchFields}/constraint)
-list(APPEND sources
+list(APPEND SOURCES
   ${constraintTetPolyPatchFields}/empty/emptyTetPolyPatchFields.C
   ${constraintTetPolyPatchFields}/wedge/wedgeTetPolyPatchFields.C
   ${constraintTetPolyPatchFields}/symmetry/symmetryTetPolyPatchFields.C
@@ -113,7 +113,7 @@ list(APPEND sources
 )
 
 set(derivedTetPolyPatchFields ${tetPolyPatchFields}/derived)
-list(APPEND sources
+list(APPEND SOURCES
   ${derivedTetPolyPatchFields}/global/globalTetPolyPatchFields.C
   ${derivedTetPolyPatchFields}/componentMixed/componentMixedTetPolyPatchVectorField.C
   ${derivedTetPolyPatchFields}/oscillatingFixedValue/oscillatingFixedValueTetPolyPatchFields.C
@@ -122,12 +122,12 @@ list(APPEND sources
 )
 
 set(elementPatchFields fields/elementPatchFields)
-list(APPEND sources
+list(APPEND SOURCES
   ${elementPatchFields}/elementPatchField/elementPatchFields.C
 )
 
 set(basicElementPatchFields ${elementPatchFields}/basic)
-list(APPEND sources
+list(APPEND SOURCES
   ${basicElementPatchFields}/calculated/calculatedElementPatchFields.C
   ${basicElementPatchFields}/coupled/coupledElementPatchFields.C
   ${basicElementPatchFields}/coupledFace/coupledFaceElementPatchFields.C
@@ -135,7 +135,7 @@ list(APPEND sources
 )
 
 set(constraintElementPatchFields ${elementPatchFields}/constraint)
-list(APPEND sources
+list(APPEND SOURCES
   ${constraintElementPatchFields}/empty/emptyElementPatchFields.C
   ${constraintElementPatchFields}/wedge/wedgeElementPatchFields.C
   ${constraintElementPatchFields}/symmetry/symmetryElementPatchFields.C
@@ -147,8 +147,6 @@ list(APPEND sources
   tetFemMatrix/tetFemMatrices.C
 )
 
-add_foam_library(tetFiniteElement SHARED ${sources})
+add_foam_library(tetFiniteElement SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(tetFiniteElement PUBLIC meshTools)
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/CMakeLists.txt b/src/thermophysicalModels/barotropicCompressibilityModel/CMakeLists.txt
index 4bf6a48e1..1f2babe29 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/CMakeLists.txt
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   barotropicCompressibilityModel/barotropicCompressibilityModel.C
   barotropicCompressibilityModel/newBarotropicCompressibilityModel.C
   linear/linear.C
@@ -38,8 +38,6 @@ list(APPEND sources
   Chung/Chung.C
 )
 
-add_foam_library(barotropicCompressibilityModel SHARED ${sources})
+add_foam_library(barotropicCompressibilityModel SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(barotropicCompressibilityModel finiteVolume)
diff --git a/src/thermophysicalModels/basic/CMakeLists.txt b/src/thermophysicalModels/basic/CMakeLists.txt
index d966c9d0e..a2480a3b8 100644
--- a/src/thermophysicalModels/basic/CMakeLists.txt
+++ b/src/thermophysicalModels/basic/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   mixtures/basicMixture/basicMixture.C
   mixtures/basicMixture/basicMixtures.C
   basicThermo/basicThermo.C
@@ -61,8 +61,6 @@ list(APPEND sources
   derivedFvPatchFields/isentropicTotalTemperature/isentropicTotalTemperatureFvPatchScalarField.C
 )
 
-add_foam_library(basicThermophysicalModels SHARED ${sources})
+add_foam_library(basicThermophysicalModels SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(basicThermophysicalModels PUBLIC finiteVolume specie thermophysicalFunctions)
diff --git a/src/thermophysicalModels/chemistryModel/CMakeLists.txt b/src/thermophysicalModels/chemistryModel/CMakeLists.txt
index ea2f1706e..7d9e6b35e 100644
--- a/src/thermophysicalModels/chemistryModel/CMakeLists.txt
+++ b/src/thermophysicalModels/chemistryModel/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   chemistryModel/basicChemistryModel/basicChemistryModel.C
   chemistryModel/psiChemistryModel/psiChemistryModel.C
   chemistryModel/psiChemistryModel/newPsiChemistryModel.C
@@ -41,8 +41,6 @@ list(APPEND sources
   chemistrySolver/chemistrySolver/makeChemistrySolvers.C
 )
 
-add_foam_library(chemistryModel SHARED ${sources})
+add_foam_library(chemistryModel SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(chemistryModel PUBLIC reactionThermophysicalModels ODE)
diff --git a/src/thermophysicalModels/laminarFlameSpeed/CMakeLists.txt b/src/thermophysicalModels/laminarFlameSpeed/CMakeLists.txt
index 915e41288..69334331f 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/CMakeLists.txt
+++ b/src/thermophysicalModels/laminarFlameSpeed/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   laminarFlameSpeed/laminarFlameSpeed.C
   laminarFlameSpeed/newLaminarFlameSpeed.C
   constant/constant.C
@@ -38,8 +38,6 @@ list(APPEND sources
   GuldersEGR/GuldersEGR.C
 )
 
-add_foam_library(laminarFlameSpeedModels SHARED ${sources})
+add_foam_library(laminarFlameSpeedModels SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(laminarFlameSpeedModels PUBLIC reactionThermophysicalModels)
diff --git a/src/thermophysicalModels/liquidMixture/CMakeLists.txt b/src/thermophysicalModels/liquidMixture/CMakeLists.txt
index a3d90bdf4..998124371 100644
--- a/src/thermophysicalModels/liquidMixture/CMakeLists.txt
+++ b/src/thermophysicalModels/liquidMixture/CMakeLists.txt
@@ -32,13 +32,11 @@
 
 set(liquidMixture liquidMixture)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${liquidMixture}/liquidMixture.C
   ${liquidMixture}/liquidMixtureIO.C
 )
 
-add_foam_library(liquidMixture SHARED ${sources})
+add_foam_library(liquidMixture SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(liquidMixture liquids specie)
diff --git a/src/thermophysicalModels/liquids/CMakeLists.txt b/src/thermophysicalModels/liquids/CMakeLists.txt
index ec4e2af30..d4c3f68f8 100644
--- a/src/thermophysicalModels/liquids/CMakeLists.txt
+++ b/src/thermophysicalModels/liquids/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   liquid/liquid.C
   H2O/H2O.C
   C7H16/C7H16.C
@@ -64,8 +64,6 @@ list(APPEND sources
   iC3H8O/iC3H8O.C
 )
 
-add_foam_library(liquids SHARED ${sources})
+add_foam_library(liquids SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(liquids thermophysicalFunctions)
diff --git a/src/thermophysicalModels/pdfs/CMakeLists.txt b/src/thermophysicalModels/pdfs/CMakeLists.txt
index e9a280d29..9d91965f5 100644
--- a/src/thermophysicalModels/pdfs/CMakeLists.txt
+++ b/src/thermophysicalModels/pdfs/CMakeLists.txt
@@ -37,7 +37,7 @@ set(general general)
 set(exponential exponential)
 set(RosinRammler RosinRammler)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${pdf}/pdf.C
   ${pdf}/newPdf.C
   ${uniform}/uniform.C
@@ -47,8 +47,6 @@ list(APPEND sources
   ${RosinRammler}/RosinRammler.C
 )
 
-add_foam_library(pdf SHARED ${sources})
+add_foam_library(pdf SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(pdf PUBLIC foam)
diff --git a/src/thermophysicalModels/radiation/CMakeLists.txt b/src/thermophysicalModels/radiation/CMakeLists.txt
index e46c7f464..4dcb93705 100644
--- a/src/thermophysicalModels/radiation/CMakeLists.txt
+++ b/src/thermophysicalModels/radiation/CMakeLists.txt
@@ -31,12 +31,12 @@
 # --------------------------------------------------------------------------
 
 #  Radiation constants 
-list(APPEND sources
+list(APPEND SOURCES
   radiationConstants/radiationConstants.C
 )
 
 #  Radiation model 
-list(APPEND sources
+list(APPEND SOURCES
   radiationModel/radiationModel/radiationModel.C
   radiationModel/radiationModel/newRadiationModel.C
   radiationModel/noRadiation/noRadiation.C
@@ -49,7 +49,7 @@ list(APPEND sources
 )
 
 #  Scatter model 
-list(APPEND sources
+list(APPEND SOURCES
   submodels/scatterModel/scatterModel/scatterModel.C
   submodels/scatterModel/scatterModel/newScatterModel.C
   submodels/scatterModel/constantScatter/constantScatter.C
@@ -57,7 +57,7 @@ list(APPEND sources
 
 
 #  Absorption/Emission model 
-list(APPEND sources
+list(APPEND SOURCES
   submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C
   submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C
   submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C
@@ -69,7 +69,7 @@ list(APPEND sources
 
 
 #  Boundary conditions 
-list(APPEND sources
+list(APPEND SOURCES
   derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C
   derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C
   derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
@@ -78,8 +78,6 @@ list(APPEND sources
   derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
 )
 
-add_foam_library(radiation SHARED ${sources})
+add_foam_library(radiation SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(radiation PUBLIC basicThermophysicalModels)
diff --git a/src/thermophysicalModels/reactionThermo/CMakeLists.txt b/src/thermophysicalModels/reactionThermo/CMakeLists.txt
index 126c5e6a0..32b7e8194 100644
--- a/src/thermophysicalModels/reactionThermo/CMakeLists.txt
+++ b/src/thermophysicalModels/reactionThermo/CMakeLists.txt
@@ -30,13 +30,13 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   chemistryReaders/chemkinReader/chemkinReader.C
 )
 FLEX_TARGET(chemkinLexer chemistryReaders/chemkinReader/chemkinLexer.L
   ${CMAKE_CURRENT_BINARY_DIR}/chemkinLexer.C COMPILE_FLAGS "-+")
-list(APPEND sources ${FLEX_chemkinLexer_OUTPUTS})
-list(APPEND sources
+list(APPEND SOURCES ${FLEX_chemkinLexer_OUTPUTS})
+list(APPEND SOURCES
   chemistryReaders/chemistryReader/makeChemistryReaders.C
   mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
   combustionThermo/hCombustionThermo/hCombustionThermo.C
@@ -59,8 +59,6 @@ list(APPEND sources
   derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C
 )
 
-add_foam_library(reactionThermophysicalModels SHARED ${sources})
+add_foam_library(reactionThermophysicalModels SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(reactionThermophysicalModels PUBLIC basicThermophysicalModels)
diff --git a/src/thermophysicalModels/solidMixture/CMakeLists.txt b/src/thermophysicalModels/solidMixture/CMakeLists.txt
index 30720316b..1b75aa222 100644
--- a/src/thermophysicalModels/solidMixture/CMakeLists.txt
+++ b/src/thermophysicalModels/solidMixture/CMakeLists.txt
@@ -30,12 +30,10 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   solidMixture/solidMixture.C
 )
 
-add_foam_library(solidMixture SHARED ${sources})
+add_foam_library(solidMixture SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(solidMixture PUBLIC solids)
diff --git a/src/thermophysicalModels/solids/CMakeLists.txt b/src/thermophysicalModels/solids/CMakeLists.txt
index 3b19d5f53..4567bf613 100644
--- a/src/thermophysicalModels/solids/CMakeLists.txt
+++ b/src/thermophysicalModels/solids/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   solid/solid.C
   solid/newSolid.C
   ash/ash.C
@@ -38,8 +38,6 @@ list(APPEND sources
   CaCO3/CaCO3.C
 )
 
-add_foam_library(solids SHARED ${sources})
+add_foam_library(solids SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(solids PUBLIC foam)
diff --git a/src/thermophysicalModels/specie/CMakeLists.txt b/src/thermophysicalModels/specie/CMakeLists.txt
index 47d15192e..a01be5dbb 100644
--- a/src/thermophysicalModels/specie/CMakeLists.txt
+++ b/src/thermophysicalModels/specie/CMakeLists.txt
@@ -36,7 +36,7 @@ set(speciesTable speciesTable)
 set(equationOfState equationOfState)
 set(reactions reaction/reactions)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${atomicWeights}/atomicWeights.C
   ${specie}/specie.C
   ${speciesTable}/speciesTable.C
@@ -50,8 +50,6 @@ list(APPEND sources
   ${reactions}/makeLangmuirHinshelwoodReactions.C
 )
 
-add_foam_library(specie SHARED ${sources})
+add_foam_library(specie SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(specie PUBLIC foam)
diff --git a/src/thermophysicalModels/thermophysicalFunctions/CMakeLists.txt b/src/thermophysicalModels/thermophysicalFunctions/CMakeLists.txt
index 19af3f437..f51cf8d92 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/CMakeLists.txt
+++ b/src/thermophysicalModels/thermophysicalFunctions/CMakeLists.txt
@@ -34,7 +34,7 @@ set(thermophysicalFunction thermophysicalFunction)
 set(NSRDSfunctions NSRDSfunctions)
 set(APIfunctions APIfunctions)
 
-list(APPEND sources
+list(APPEND SOURCES
   ${thermophysicalFunction}/thermophysicalFunction.C
   ${NSRDSfunctions}/NSRDSfunc0/NSRDSfunc0.C
   ${NSRDSfunctions}/NSRDSfunc1/NSRDSfunc1.C
@@ -49,7 +49,7 @@ list(APPEND sources
 )
 
 set(freesteam freesteam-2.1)
-list(APPEND sources
+list(APPEND SOURCES
   ${freesteam}/common.c
   ${freesteam}/steam.c
   ${freesteam}/b23.c
@@ -66,8 +66,6 @@ list(APPEND sources
   ${freesteam}/zeroin.c
 )
 
-add_foam_library(thermophysicalFunctions SHARED ${sources})
+add_foam_library(thermophysicalFunctions SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(thermophysicalFunctions foam)
diff --git a/src/transportModels/incompressible/CMakeLists.txt b/src/transportModels/incompressible/CMakeLists.txt
index 36adbf744..62c428440 100644
--- a/src/transportModels/incompressible/CMakeLists.txt
+++ b/src/transportModels/incompressible/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   viscosityModels/viscosityModel/viscosityModel.C
   viscosityModels/viscosityModel/newViscosityModel.C
   viscosityModels/Newtonian/Newtonian.C
@@ -44,15 +44,11 @@ list(APPEND sources
   incompressibleTwoPhaseMixture/twoPhaseMixture.C
 )
 
-add_foam_library(incompressibleTransportModels SHARED ${sources})
+add_foam_library(incompressibleTransportModels SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(incompressibleTransportModels finiteVolume)
 
 target_include_directories(incompressibleTransportModels PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-  $<INSTALL_INTERFACE:include/mylib> 
+#  $<INSTALL_INTERFACE:include/mylib> 
 )
-
-
diff --git a/src/transportModels/interfaceProperties/CMakeLists.txt b/src/transportModels/interfaceProperties/CMakeLists.txt
index 18bd4a23f..92191ab6a 100644
--- a/src/transportModels/interfaceProperties/CMakeLists.txt
+++ b/src/transportModels/interfaceProperties/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   interfaceProperties.C
   interfaceCompression/interfaceCompression.C
   alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -40,8 +40,6 @@ list(APPEND sources
   alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
 )
 
-add_foam_library(interfaceProperties SHARED ${sources})
+add_foam_library(interfaceProperties SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(interfaceProperties PUBLIC finiteVolume)
diff --git a/src/transportModels/viscoelastic/CMakeLists.txt b/src/transportModels/viscoelastic/CMakeLists.txt
index 1c6380386..3fd4c9897 100644
--- a/src/transportModels/viscoelastic/CMakeLists.txt
+++ b/src/transportModels/viscoelastic/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   viscoelasticModel/viscoelasticModel.C
   viscoelasticLaws/viscoelasticLaw/viscoelasticLaw.C
   viscoelasticLaws/viscoelasticLaw/newViscoelasticLaw.C
@@ -54,8 +54,6 @@ list(APPEND sources
   viscoelasticLaws/multiMode/multiMode.C
 )
 
-add_foam_library(viscoelasticTransportModels SHARED ${sources})
+add_foam_library(viscoelasticTransportModels SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(viscoelasticTransportModels PUBLIC finiteVolume)
diff --git a/src/turbulenceModels/LES/LESdeltas/CMakeLists.txt b/src/turbulenceModels/LES/LESdeltas/CMakeLists.txt
index 2dda760e7..7dab3ea0d 100644
--- a/src/turbulenceModels/LES/LESdeltas/CMakeLists.txt
+++ b/src/turbulenceModels/LES/LESdeltas/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   LESdelta/LESdelta.C
   cubeRootVolDelta/cubeRootVolDelta.C
   PrandtlDelta/PrandtlDelta.C
@@ -38,8 +38,6 @@ list(APPEND sources
   smoothDelta/smoothDelta.C
 )
 
-add_foam_library(LESdeltas SHARED ${sources})
+add_foam_library(LESdeltas SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(LESdeltas PUBLIC finiteVolume)
diff --git a/src/turbulenceModels/LES/LESfilters/CMakeLists.txt b/src/turbulenceModels/LES/LESfilters/CMakeLists.txt
index 70b6ab3ae..9a718db04 100644
--- a/src/turbulenceModels/LES/LESfilters/CMakeLists.txt
+++ b/src/turbulenceModels/LES/LESfilters/CMakeLists.txt
@@ -30,15 +30,13 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   LESfilter/LESfilter.C
   simpleFilter/simpleFilter.C
   laplaceFilter/laplaceFilter.C
   anisotropicFilter/anisotropicFilter.C
 )
 
-add_foam_library(LESfilters SHARED ${sources})
+add_foam_library(LESfilters SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(LESfilters PUBLIC finiteVolume)
diff --git a/src/turbulenceModels/compressible/LES/CMakeLists.txt b/src/turbulenceModels/compressible/LES/CMakeLists.txt
index 8ca2e107a..40db1a5f3 100644
--- a/src/turbulenceModels/compressible/LES/CMakeLists.txt
+++ b/src/turbulenceModels/compressible/LES/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   LESModel/LESModel.C
   GenEddyVisc/GenEddyVisc.C
   GenSGSStress/GenSGSStress.C
@@ -47,18 +47,16 @@ list(APPEND sources
 set(wallFunctions derivedFvPatchFields/wallFunctions)
 
 set(muSgsWallFunctions ${wallFunctions}/muSgsWallFunctions)
-list(APPEND sources
+list(APPEND SOURCES
   ${muSgsWallFunctions}/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
 )
 
 set(alphaSgsWallFunctions ${wallFunctions}/alphaSgsWallFunctions)
-list(APPEND sources
+list(APPEND SOURCES
   ${alphaSgsWallFunctions}/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C
   ${alphaSgsWallFunctions}/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
 )
 
-add_foam_library(compressibleLESModels SHARED ${sources})
+add_foam_library(compressibleLESModels SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(compressibleLESModels PUBLIC compressibleTurbulenceModel LESdeltas LESfilters)
diff --git a/src/turbulenceModels/compressible/RAS/CMakeLists.txt b/src/turbulenceModels/compressible/RAS/CMakeLists.txt
index 16e8538b8..d95afc1be 100644
--- a/src/turbulenceModels/compressible/RAS/CMakeLists.txt
+++ b/src/turbulenceModels/compressible/RAS/CMakeLists.txt
@@ -31,7 +31,7 @@
 # --------------------------------------------------------------------------
 
 #  RAS turbulence models 
-list(APPEND sources
+list(APPEND SOURCES
   RASModel/RASModel.C
   laminar/laminar.C
   kEpsilon/kEpsilon.C
@@ -48,12 +48,12 @@ list(APPEND sources
 set(wallFunctions derivedFvPatchFields/wallFunctions)
 
 set(alphatWallFunctions ${wallFunctions}/alphatWallFunctions)
-list(APPEND sources
+list(APPEND SOURCES
   ${alphatWallFunctions}/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
 )
 
 set(mutWallFunctions ${wallFunctions}/mutWallFunctions)
-list(APPEND sources
+list(APPEND SOURCES
   ${mutWallFunctions}/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C
   ${mutWallFunctions}/mutWallFunction/mutWallFunctionFvPatchScalarField.C
   ${mutWallFunctions}/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C
@@ -64,22 +64,22 @@ list(APPEND sources
 )
 
 set(epsilonWallFunctions ${wallFunctions}/epsilonWallFunctions)
-list(APPEND sources
+list(APPEND SOURCES
   ${epsilonWallFunctions}/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
 )
 
 set(omegaWallFunctions ${wallFunctions}/omegaWallFunctions)
-list(APPEND sources
+list(APPEND SOURCES
   ${omegaWallFunctions}/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
 )
 
 set(kqRWallFunctions ${wallFunctions}/kqRWallFunctions)
-list(APPEND sources
+list(APPEND SOURCES
   ${kqRWallFunctions}/kqRWallFunction/kqRWallFunctionFvPatchFields.C
 )
 
 #  Patch fields 
-list(APPEND sources
+list(APPEND SOURCES
   derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
   derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
   derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
@@ -89,13 +89,11 @@ list(APPEND sources
   backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
 )
 
-add_foam_library(compressibleRASModels SHARED ${sources})
+add_foam_library(compressibleRASModels SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(compressibleRASModels PUBLIC compressibleTurbulenceModel)
 
 target_include_directories(compressibleRASModels PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/derivedFvPatchFields/wallFunctions/mutWallFunctions>
-  $<INSTALL_INTERFACE:include/mylib>
+#  $<INSTALL_INTERFACE:include/mylib>
 )
diff --git a/src/turbulenceModels/compressible/turbulenceModel/CMakeLists.txt b/src/turbulenceModels/compressible/turbulenceModel/CMakeLists.txt
index 8c10d34e6..cb0442f0d 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/CMakeLists.txt
+++ b/src/turbulenceModels/compressible/turbulenceModel/CMakeLists.txt
@@ -30,19 +30,17 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   turbulenceModel.C
   laminar/laminar.C
 )
 
-add_foam_library(compressibleTurbulenceModel SHARED ${sources})
+add_foam_library(compressibleTurbulenceModel SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(compressibleTurbulenceModel PUBLIC basicThermophysicalModels)
 
 # Hack to cope with some weird include paths
 target_include_directories(compressibleTurbulenceModel PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
-  $<INSTALL_INTERFACE:include/mylib>
+#  $<INSTALL_INTERFACE:include/mylib>
 )
diff --git a/src/turbulenceModels/incompressible/LES/CMakeLists.txt b/src/turbulenceModels/incompressible/LES/CMakeLists.txt
index 824c6e35a..ec0bf36f9 100644
--- a/src/turbulenceModels/incompressible/LES/CMakeLists.txt
+++ b/src/turbulenceModels/incompressible/LES/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   vanDriestDelta/vanDriestDelta.C
   LESModel/LESModel.C
   GenEddyVisc/GenEddyVisc.C
@@ -55,25 +55,23 @@ list(APPEND sources
 
 # Smagorinsky2/Smagorinsky2.C
 
-list(APPEND sources
+list(APPEND SOURCES
   kOmegaSSTSAS/kOmegaSSTSAS.C
 )
 
 #  Wall functions 
 set(wallFunctions derivedFvPatchFields/wallFunctions)
 
-list(APPEND sources
+list(APPEND SOURCES
   derivedFvPatchFields/decayingTurbulence/decayingVorton.C
   derivedFvPatchFields/decayingTurbulence/decayingTurbulenceFvPatchVectorField.C
 )
 
 set(nuSgsWallFunctions ${wallFunctions}/nuSgsWallFunctions)
-list(APPEND sources
+list(APPEND SOURCES
   ${nuSgsWallFunctions}/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
 )
 
-add_foam_library(incompressibleLESModels SHARED ${sources})
+add_foam_library(incompressibleLESModels SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(incompressibleLESModels PUBLIC incompressibleTurbulenceModel LESdeltas LESfilters)
diff --git a/src/turbulenceModels/incompressible/RAS/CMakeLists.txt b/src/turbulenceModels/incompressible/RAS/CMakeLists.txt
index 24f1e2f6f..6797817c6 100644
--- a/src/turbulenceModels/incompressible/RAS/CMakeLists.txt
+++ b/src/turbulenceModels/incompressible/RAS/CMakeLists.txt
@@ -31,7 +31,7 @@
 # --------------------------------------------------------------------------
 
 #  RAS turbulence models 
-list(APPEND sources
+list(APPEND SOURCES
   RASModel/RASModel.C
   laminar/laminar.C
   kEpsilon/kEpsilon.C
@@ -57,7 +57,7 @@ list(APPEND sources
 set(wallFunctions derivedFvPatchFields/wallFunctions)
 
 set(nutWallFunctions ${wallFunctions}/nutWallFunctions)
-list(APPEND sources
+list(APPEND SOURCES
   ${nutWallFunctions}/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
   ${nutWallFunctions}/nutWallFunction/nutWallFunctionFvPatchScalarField.C
   ${nutWallFunctions}/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
@@ -68,42 +68,39 @@ list(APPEND sources
 )
 
 set(epsilonWallFunctions ${wallFunctions}/epsilonWallFunctions)
-list(APPEND sources
+list(APPEND SOURCES
   ${epsilonWallFunctions}/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
 )
 
 set(omegaWallFunctions ${wallFunctions}/omegaWallFunctions)
-list(APPEND sources
+list(APPEND SOURCES
   ${omegaWallFunctions}/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
 )
 
 set(kqRWallFunctions ${wallFunctions}/kqRWallFunctions)
-list(APPEND sources
+list(APPEND SOURCES
   ${kqRWallFunctions}/kqRWallFunction/kqRWallFunctionFvPatchFields.C
 )
 
 set(RWallFunctions ${wallFunctions}/RWallFunctions)
-list(APPEND sources
+list(APPEND SOURCES
   ${RWallFunctions}/RWallFunction/RWallFunctionFvPatchSymmTensorField.C
 )
 
 
 #  Patch fields 
-list(APPEND sources
+list(APPEND SOURCES
   derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
   derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
   derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
   backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
 )
 
-add_foam_library(incompressibleRASModels SHARED ${sources})
+add_foam_library(incompressibleRASModels SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(incompressibleRASModels PUBLIC incompressibleTurbulenceModel)
 
 target_include_directories(incompressibleRASModels PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/derivedFvPatchFields/wallFunctions/nutWallFunctions>
-  $<INSTALL_INTERFACE:include/mylib>
+#  $<INSTALL_INTERFACE:include/mylib>
 )
-
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/CMakeLists.txt b/src/turbulenceModels/incompressible/turbulenceModel/CMakeLists.txt
index 1d684e99c..84429a9eb 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/CMakeLists.txt
+++ b/src/turbulenceModels/incompressible/turbulenceModel/CMakeLists.txt
@@ -30,19 +30,17 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   turbulenceModel.C
   laminar/laminar.C
 )
 
-add_foam_library(incompressibleTurbulenceModel SHARED ${sources})
+add_foam_library(incompressibleTurbulenceModel SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 target_link_libraries(incompressibleTurbulenceModel PUBLIC incompressibleTransportModels)
 
 # Hack to cope with some weird include paths
 target_include_directories(incompressibleTurbulenceModel PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
-  $<INSTALL_INTERFACE:include/mylib>
+#  $<INSTALL_INTERFACE:include/mylib>
 )
diff --git a/tutorials/basic/PODSolver/1DPODsin/setTcos/CMakeLists.txt b/tutorials/basic/PODSolver/1DPODsin/setTcos/CMakeLists.txt
index caa320cba..31bec57fc 100644
--- a/tutorials/basic/PODSolver/1DPODsin/setTcos/CMakeLists.txt
+++ b/tutorials/basic/PODSolver/1DPODsin/setTcos/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   setTcos.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(setTcos
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/CMakeLists.txt b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/CMakeLists.txt
index cc33825cb..462697428 100644
--- a/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/CMakeLists.txt
+++ b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   analyticalCylinder.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(analyticalCylinder
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/tutorials/basic/scalarTransportFoam/swirlTest/setSwirl/CMakeLists.txt b/tutorials/basic/scalarTransportFoam/swirlTest/setSwirl/CMakeLists.txt
index 195a1270b..7ecbd66ee 100644
--- a/tutorials/basic/scalarTransportFoam/swirlTest/setSwirl/CMakeLists.txt
+++ b/tutorials/basic/scalarTransportFoam/swirlTest/setSwirl/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   setSwirl.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(setSwirl
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/CMakeLists.txt b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/CMakeLists.txt
index 467353bc2..8abe6cb54 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/CMakeLists.txt
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   datToFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(datToFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/setInitialDroplet/CMakeLists.txt b/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/setInitialDroplet/CMakeLists.txt
index d7adbaddf..7d165877a 100644
--- a/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/setInitialDroplet/CMakeLists.txt
+++ b/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/setInitialDroplet/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   setInitialDroplet.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(setInitialDroplet
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/tutorials/finiteArea/surfactantFoam/sphereTransport/sphereSurfactantFoam/CMakeLists.txt b/tutorials/finiteArea/surfactantFoam/sphereTransport/sphereSurfactantFoam/CMakeLists.txt
index b071442dc..646ad316f 100644
--- a/tutorials/finiteArea/surfactantFoam/sphereTransport/sphereSurfactantFoam/CMakeLists.txt
+++ b/tutorials/finiteArea/surfactantFoam/sphereTransport/sphereSurfactantFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   surfactantFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(sphereSurfactantFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/CMakeLists.txt b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/CMakeLists.txt
index 391c474b5..bfef0cf41 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/CMakeLists.txt
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   setHotRoom.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(setHotRoom
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/tutorials/heatTransfer/setHotRoom/CMakeLists.txt b/tutorials/heatTransfer/setHotRoom/CMakeLists.txt
index 391c474b5..bfef0cf41 100644
--- a/tutorials/heatTransfer/setHotRoom/CMakeLists.txt
+++ b/tutorials/heatTransfer/setHotRoom/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   setHotRoom.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(setHotRoom
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/tutorials/immersedBoundary/sphereInChannel/refineSphereMesh/CMakeLists.txt b/tutorials/immersedBoundary/sphereInChannel/refineSphereMesh/CMakeLists.txt
index 2dd01d972..a81583497 100644
--- a/tutorials/immersedBoundary/sphereInChannel/refineSphereMesh/CMakeLists.txt
+++ b/tutorials/immersedBoundary/sphereInChannel/refineSphereMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   refineSphereMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(refineSphereMesh
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/tutorials/immersedBoundary/thickPlateRefinedMesh/refineThickPlateMesh/CMakeLists.txt b/tutorials/immersedBoundary/thickPlateRefinedMesh/refineThickPlateMesh/CMakeLists.txt
index 5066e4b5a..6add93513 100644
--- a/tutorials/immersedBoundary/thickPlateRefinedMesh/refineThickPlateMesh/CMakeLists.txt
+++ b/tutorials/immersedBoundary/thickPlateRefinedMesh/refineThickPlateMesh/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   refineThickPlateMesh.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(refineThickPlateMesh
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/CMakeLists.txt b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/CMakeLists.txt
index edfceb164..09192fa6c 100644
--- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/CMakeLists.txt
+++ b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/CMakeLists.txt
@@ -30,12 +30,10 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   RBFMotionFunctionObject.C
 )
 
-add_foam_library(RBFMotionFunction SHARED ${sources})
+add_foam_library(RBFMotionFunction SHARED ${SOURCES})
 
-# This is a prototype! Replace second argument with a list of the highest
-# dependencies only. Inherited dependencies will be treated automatically.
 #target_link_libraries(RBFMotionFunction finiteVolume)
diff --git a/tutorials/incompressible/icoDyMFoam/movingConeMotion/setMotionMovingCone/CMakeLists.txt b/tutorials/incompressible/icoDyMFoam/movingConeMotion/setMotionMovingCone/CMakeLists.txt
index a19ee857f..93809682b 100644
--- a/tutorials/incompressible/icoDyMFoam/movingConeMotion/setMotionMovingCone/CMakeLists.txt
+++ b/tutorials/incompressible/icoDyMFoam/movingConeMotion/setMotionMovingCone/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   setMotionMovingCone.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(setMotionMovingCone
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/tutorials/lagrangian/icoLagrangianFoam/icoLagrangianFoam/CMakeLists.txt b/tutorials/lagrangian/icoLagrangianFoam/icoLagrangianFoam/CMakeLists.txt
index 583e59520..37f395945 100644
--- a/tutorials/lagrangian/icoLagrangianFoam/icoLagrangianFoam/CMakeLists.txt
+++ b/tutorials/lagrangian/icoLagrangianFoam/icoLagrangianFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   icoLagrangianFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(icoLagrangianFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/CMakeLists.txt b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/CMakeLists.txt
index 503c8068f..41b20dabb 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/CMakeLists.txt
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   rhoPisoTwinParcelFoam.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(rhoPisoTwinParcelFoam
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/CMakeLists.txt b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/CMakeLists.txt
index 34263f824..0ca6b7490 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/CMakeLists.txt
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   gen6DoF.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(gen6DoF
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/tutorials/solidMechanics/elasticSolidFoam/plateHole/analyticalPlateHole/CMakeLists.txt b/tutorials/solidMechanics/elasticSolidFoam/plateHole/analyticalPlateHole/CMakeLists.txt
index 4e674b9d1..ff02c374f 100644
--- a/tutorials/solidMechanics/elasticSolidFoam/plateHole/analyticalPlateHole/CMakeLists.txt
+++ b/tutorials/solidMechanics/elasticSolidFoam/plateHole/analyticalPlateHole/CMakeLists.txt
@@ -30,7 +30,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   analyticalPlateHole.C
 )
 
@@ -42,5 +42,5 @@ endif()
 
 add_foam_executable(analyticalPlateHole
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )
diff --git a/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/analyticalHotCylinder/CMakeLists.txt b/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/analyticalHotCylinder/CMakeLists.txt
index 486d4b439..0793e874f 100644
--- a/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/analyticalHotCylinder/CMakeLists.txt
+++ b/tutorials/solidMechanics/elasticThermalSolidFoam/hotCylinder/analyticalHotCylinder/CMakeLists.txt
@@ -29,7 +29,7 @@
 #
 # --------------------------------------------------------------------------
 
-list(APPEND sources
+list(APPEND SOURCES
   analyticalHotCylinder.C
 )
 
@@ -41,5 +41,5 @@ endif()
 
 add_foam_executable(analyticalHotCylinder
 #   DEPENDS finiteVolume
-  SOURCES ${sources}
+  SOURCES ${SOURCES}
 )