diff --git a/Applications/ApplicationsLib/CMakeLists.txt b/Applications/ApplicationsLib/CMakeLists.txt
index 1987e809d218093d1645170621a3742bbd2e1b01..4d00c3f2ef84bef04c75dde5b0fdb71ba77e6ae6 100644
--- a/Applications/ApplicationsLib/CMakeLists.txt
+++ b/Applications/ApplicationsLib/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Source files
-GET_SOURCE_FILES(SOURCES_APPLICATIONSLIB)
+get_source_files(SOURCES_APPLICATIONSLIB)
 set(LIB_SOURCES ${SOURCES_APPLICATIONSLIB})
 
 # Library
@@ -9,16 +9,20 @@ if(BUILD_SHARED_LIBS)
 endif()
 
 target_link_libraries(ApplicationsLib
-    PUBLIC BaseLib GeoLib Processes logog
-    PRIVATE MathLib MeshLib MeshGeoToolsLib NumLib ParameterLib
-)
+                      PUBLIC BaseLib GeoLib Processes logog
+                      PRIVATE MathLib
+                              MeshLib
+                              MeshGeoToolsLib
+                              NumLib
+                              ParameterLib)
 
 # Set cpp definitions if the cmake option is enabled for the given process.
 foreach(process ${ProcessesList})
     if(OGS_BUILD_PROCESS_${process})
         string(TOUPPER "OGS_BUILD_PROCESS_${process}" EnableProcess)
-        set_property(SOURCE ProjectData.cpp APPEND PROPERTY COMPILE_DEFINITIONS
-            ${EnableProcess})
+        set_property(SOURCE ProjectData.cpp
+                     APPEND
+                     PROPERTY COMPILE_DEFINITIONS ${EnableProcess})
     endif()
 endforeach()
 
diff --git a/Applications/CLI/CMakeLists.txt b/Applications/CLI/CMakeLists.txt
index 30a38e1caa074e27318fc3d8e578c0872e7e2521..bb8917b328854f4981be66e7c6687e880ac073bd 100644
--- a/Applications/CLI/CMakeLists.txt
+++ b/Applications/CLI/CMakeLists.txt
@@ -1,27 +1,27 @@
-
 add_executable(ogs ogs.cpp)
 
-target_link_libraries(ogs
-    PRIVATE BaseLib ApplicationsLib
-)
+target_link_libraries(ogs PRIVATE BaseLib ApplicationsLib)
 
 if(OGS_USE_PYTHON)
-    # Troubleshooting:
-    # If you get linker errors, such as   ogs.cpp:(.text+0xb4): undefined reference to `_Py_ZeroStruct'
-    # it could be that OGS is compiled with the wrong Python version.
-    # I (Ch. Leh.) observed the following: The symbol _Py_ZeroStruct could not be found in /usr/lib/libpython3.6m.so (I intended to compile OGS with Python3).
-    # It's apparently a Python2 symbol (present in /usr/lib/libpython2.7.so)
-    # The compiler command-line was the following:
+    # Troubleshooting: If you get linker errors, such as   ogs.cpp:(.text+0xb4):
+    # undefined reference to `_Py_ZeroStruct' it could be that OGS is compiled
+    # with the wrong Python version. I (Ch. Leh.) observed the following: The
+    # symbol _Py_ZeroStruct could not be found in /usr/lib/libpython3.6m.so (I
+    # intended to compile OGS with Python3). It's apparently a Python2 symbol
+    # (present in /usr/lib/libpython2.7.so) The compiler command-line was the
+    # following:
+    # ~~~
     # /usr/bin/g++ ... -DvtkRenderingVolume_AUTOINIT="1(vtkRenderingVolumeOpenGL2)" \
     #     -I/usr/include/vtk -I/usr/include/python2.7 -I/usr/include/freetype2 \
     #     -I/usr/include/libxml2 ... -I/.../BaseLib ... \
     #     -isystem /usr/include/python3.6m ... -o CMakeFiles/ogs.dir/ogs.cpp.o \
     #     -c /.../Applications/CLI/ogs.cpp
-    # In particular, the Python2 include path comes before the Python3 include path.
-    # Compiling OGS with Python2 solved the issue.
-    # I assume (this is only a guess!) that VTK pulls in Python2 dependencies (on my system).
-    # I assume that this is related to https://github.com/ufz/ogs/pull/2158.
-    # Workaround: Always make sure that OGS is compiled with the same Python version as VTK.
+    # ~~~
+    # In particular, the Python2 include path comes before the Python3 include
+    # path. Compiling OGS with Python2 solved the issue. I assume (this is only
+    # a guess!) that VTK pulls in Python2 dependencies (on my system). I assume
+    # that this is related to https://github.com/ufz/ogs/pull/2158. Workaround:
+    # Always make sure that OGS is compiled with the same Python version as VTK.
     # The error described above should be detected automatically by cmake and an
     # appropriate message should be presented. The note is kept for the case
     # that the automatic detection does not work due to whatever reason.
@@ -29,25 +29,29 @@ if(OGS_USE_PYTHON)
     add_library(ogs_embedded_python ogs_embedded_python.cpp)
 
     # Performance warning from
-    # https://github.com/pybind/pybind11/blob/master/docs/compiling.rst:
-    # Since pybind11 is a metatemplate library, it is crucial that certain compiler
-    # flags are provided to ensure high quality code generation. In contrast to the
-    # pybind11_add_module() command, the CMake interface library only provides the
-    # minimal set of parameters to ensure that the code using pybind11 compiles, but
-    # it does not pass these extra compiler flags (i.e. this is up to you).
-    # TODO: Enable further compiler/linker flags.
+    # https://github.com/pybind/pybind11/blob/master/docs/compiling.rst: Since
+    # pybind11 is a metatemplate library, it is crucial that certain compiler
+    # flags are provided to ensure high quality code generation. In contrast to
+    # the pybind11_add_module() command, the CMake interface library only
+    # provides the minimal set of parameters to ensure that the code using
+    # pybind11 compiles, but it does not pass these extra compiler flags (i.e.
+    # this is up to you). TODO: Enable further compiler/linker flags.
     target_link_libraries(ogs_embedded_python PUBLIC pybind11::embed)
     target_compile_definitions(ogs_embedded_python PUBLIC OGS_USE_PYTHON)
-    target_link_libraries(ogs_embedded_python PRIVATE
-        ProcessLibBoundaryConditionPythonModule ProcessLibSourceTermPythonModule)
+    target_link_libraries(ogs_embedded_python
+                          PRIVATE ProcessLibBoundaryConditionPythonModule
+                                  ProcessLibSourceTermPythonModule)
 
     target_link_libraries(ogs PRIVATE ogs_embedded_python)
 
     if(BUILD_SHARED_LIBS)
-        # Add macro definition, because static libs make special handling necessary
-        # s.t. the embedded OpenGeoSys Python module won't be removed by the linker.
-        target_compile_definitions(ogs_embedded_python PRIVATE OGS_BUILD_SHARED_LIBS)
-        install(TARGETS ogs_embedded_python LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+        # Add macro definition, because static libs make special handling
+        # necessary s.t. the embedded OpenGeoSys Python module won't be removed
+        # by the linker.
+        target_compile_definitions(ogs_embedded_python PRIVATE
+                                   OGS_BUILD_SHARED_LIBS)
+        install(TARGETS ogs_embedded_python
+                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
     endif()
 endif()
@@ -64,20 +68,19 @@ if(OGS_USE_PCH)
     cotire(ogs)
 endif()
 
-####################
-### Tests ##########
-####################
+# ---- Tests ----
 add_test(NAME ogs_no_args COMMAND ogs)
 set_tests_properties(ogs_no_args PROPERTIES WILL_FAIL TRUE)
 
-####################
-### Installation ###
-####################
+# ---- Installation ----
 install(TARGETS ogs RUNTIME DESTINATION bin COMPONENT ogs_cli)
 
-set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "ogs" "OGS Simulator")
+set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "ogs"
+                              "OGS Simulator")
 cpack_add_component(ogs_cli
-    DISPLAY_NAME "OGS THMC Simulator"
-    DESCRIPTION "The command line interface for OpenGeoSys."
-    GROUP Applications
-)
+                    DISPLAY_NAME
+                    "OGS THMC Simulator"
+                    DESCRIPTION
+                    "The command line interface for OpenGeoSys."
+                    GROUP
+                    Applications)
diff --git a/Applications/DataExplorer/Base/CMakeLists.txt b/Applications/DataExplorer/Base/CMakeLists.txt
index c8f22d0819c0a77663f77b56af00838b12315691..112e81c89b668f324f94449399f8aa5703c955b6 100644
--- a/Applications/DataExplorer/Base/CMakeLists.txt
+++ b/Applications/DataExplorer/Base/CMakeLists.txt
@@ -8,8 +8,7 @@ set(SOURCES
     ColorPickerPushButton.cpp
     TreeModelIterator.cpp
     CheckboxDelegate.cpp
-    QValueTooltipSlider.cpp
-)
+    QValueTooltipSlider.cpp)
 
 # Header files
 set(HEADERS
@@ -23,18 +22,14 @@ set(HEADERS
     TreeModel.h
     ColorPickerPushButton.h
     CheckboxDelegate.h
-    QValueTooltipSlider.h
-)
+    QValueTooltipSlider.h)
 
 # Put moc files in a project folder
 source_group("UI Files" REGULAR_EXPRESSION "\\w*\\.ui")
 source_group("Moc Files" REGULAR_EXPRESSION "moc_.*")
 
 # Create the library
-add_library(QtBase
-    ${SOURCES}
-    ${HEADERS}
-)
+add_library(QtBase ${SOURCES} ${HEADERS})
 if(BUILD_SHARED_LIBS)
     install(TARGETS QtBase LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
diff --git a/Applications/DataExplorer/CMakeLists.txt b/Applications/DataExplorer/CMakeLists.txt
index 005036f32b19a6a7cdf8710928cab730348f2b30..2e991908d77c4314989549733d450f1b67e25c80 100644
--- a/Applications/DataExplorer/CMakeLists.txt
+++ b/Applications/DataExplorer/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}")
-# Always built Data Explorer statically as there are cyclic dependencies
-# between QtDataView and VtkVis
+# Always built Data Explorer statically as there are cyclic dependencies between
+# QtDataView and VtkVis
 set(BUILD_SHARED_LIBS OFF)
 
 if(MSVC)
@@ -11,9 +11,7 @@ if(VTKFBXCONVERTER_FOUND)
     add_definitions(-DVTKFBXCONVERTER_FOUND)
 endif()
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 set(CMAKE_AUTOMOC TRUE)
 set(CMAKE_AUTOUIC TRUE)
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 6efad20625266232328e6c95b166d68d4da33704..96264714217423008a442035851022a9300720e0 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -91,9 +91,7 @@ if(OGS_USE_PCH)
     cotire(DataExplorer)
 endif()
 
-####################
-### Installation ###
-####################
+# ---- Installation ----
 install(TARGETS DataExplorer RUNTIME DESTINATION bin COMPONENT ogs_gui)
 
 cpack_add_component(ogs_gui
diff --git a/Applications/DataExplorer/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt
index 06a747961a4d290337850468920ddb2ff50e2dbb..216248285f4f03636ffcfbc68afedbeda4d6dda3 100644
--- a/Applications/DataExplorer/DataView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/CMakeLists.txt
@@ -41,8 +41,7 @@ set(SOURCES
     StationTabWidget.cpp
     StationTreeModel.cpp
     StationTreeView.cpp
-    SurfaceExtractionDialog.cpp
-)
+    SurfaceExtractionDialog.cpp)
 
 set(HEADERS
     AddLayerToMeshDialog.h
@@ -92,56 +91,60 @@ set(HEADERS
     StationTabWidget.h
     StationTreeModel.h
     StationTreeView.h
-    SurfaceExtractionDialog.h
-)
+    SurfaceExtractionDialog.h)
 
 # Visual Studio folder
 source_group("Dialog Header Files" REGULAR_EXPRESSION "[.]*Dialog.h")
 source_group("Dialog Source Files" REGULAR_EXPRESSION "[.]*Dialog.cpp")
-source_group("Data Model Header Files" REGULAR_EXPRESSION "[.]*Item.h|[.]*Model.h|[.]*View.h")
-source_group("Data Model Source Files" REGULAR_EXPRESSION "[.]*Item.cpp|[.]*Model.cpp|[.]*View.cpp")
+source_group("Data Model Header Files" REGULAR_EXPRESSION
+             "[.]*Item.h|[.]*Model.h|[.]*View.h")
+source_group("Data Model Source Files" REGULAR_EXPRESSION
+             "[.]*Item.cpp|[.]*Model.cpp|[.]*View.cpp")
 file(GLOB UIS CONFIGURE_DEPENDS *.ui)
 source_group("UI Files" FILES ${UIS})
 
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/..)
-include_directories(
-    ${SOURCE_DIR_REL}/Applications/FileIO
-    ${SOURCE_DIR_REL}/BaseLib
-    ${SOURCE_DIR_REL}/MathLib
-    ${SOURCE_DIR_REL}/GeoLib
-    ${SOURCE_DIR_REL}/MeshGeoToolsLib
-    ${SOURCE_DIR_REL}/MeshLib
-    ${GUI_SOURCE_DIR_REL}/Base
-    ${GUI_SOURCE_DIR_REL}/VtkVis
-
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/DiagramView
-    ${CMAKE_CURRENT_SOURCE_DIR}/StratView
-)
+include_directories(${SOURCE_DIR_REL}/Applications/FileIO
+                    ${SOURCE_DIR_REL}/BaseLib
+                    ${SOURCE_DIR_REL}/MathLib
+                    ${SOURCE_DIR_REL}/GeoLib
+                    ${SOURCE_DIR_REL}/MeshGeoToolsLib
+                    ${SOURCE_DIR_REL}/MeshLib
+                    ${GUI_SOURCE_DIR_REL}/Base
+                    ${GUI_SOURCE_DIR_REL}/VtkVis
+                    ${CMAKE_CURRENT_SOURCE_DIR}
+                    ${CMAKE_CURRENT_SOURCE_DIR}/DiagramView
+                    ${CMAKE_CURRENT_SOURCE_DIR}/StratView)
 
 if(GEOTIFF_FOUND)
     include_directories(${GEOTIFF_INCLUDE_DIRS})
 endif() # GEOTIFF_FOUND
 
-add_library(QtDataView
-    ${SOURCES}
-    ${HEADERS}
-    ${UIS}
-)
+add_library(QtDataView ${SOURCES} ${HEADERS} ${UIS})
 if(BUILD_SHARED_LIBS)
     install(TARGETS QtDataView LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
 
 target_link_libraries(QtDataView
-    PUBLIC GeoLib MeshGeoToolsLib MeshLib QtBase VtkVis
-    PRIVATE BaseLib MathLib ApplicationsFileIO QtDiagramView QtStratView
-        DataHolderLib logog Qt5::Core Qt5::Gui
-)
+                      PUBLIC GeoLib
+                             MeshGeoToolsLib
+                             MeshLib
+                             QtBase
+                             VtkVis
+                      PRIVATE BaseLib
+                              MathLib
+                              ApplicationsFileIO
+                              QtDiagramView
+                              QtStratView
+                              DataHolderLib
+                              logog
+                              Qt5::Core
+                              Qt5::Gui)
 
 if(GEOTIFF_FOUND)
     target_link_libraries(QtDataView PRIVATE ${GEOTIFF_LIBRARIES})
-endif () # GEOTIFF_FOUND
+endif() # GEOTIFF_FOUND
 
 add_autogen_include(QtDataView)
 
diff --git a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
index c9503d12f2eff72481b0304c3c42b6ce462c53de..3da36416dcf351c121f4172cc3a70059d447dc05 100644
--- a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
@@ -5,8 +5,7 @@ set(SOURCES
     DiagramScene.cpp
     DiagramView.cpp
     QArrow.cpp
-    QGraphicsGrid.cpp
-)
+    QGraphicsGrid.cpp)
 
 set(HEADERS
     DiagramList.h
@@ -16,35 +15,32 @@ set(HEADERS
     DiagramScene.h
     DetailWindow.h
     DiagramPrefsDialog.h
-    DiagramView.h
-)
+    DiagramView.h)
 
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../..)
-include_directories(
-    ${SOURCE_DIR_REL}/BaseLib
-    ${SOURCE_DIR_REL}/GeoLib
-    ${SOURCE_DIR_REL}/MathLib
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${GUI_SOURCE_DIR_REL}/Base
-    ${GUI_SOURCE_DIR_REL}/DataView
-)
+include_directories(${SOURCE_DIR_REL}/BaseLib
+                    ${SOURCE_DIR_REL}/GeoLib
+                    ${SOURCE_DIR_REL}/MathLib
+                    ${CMAKE_CURRENT_SOURCE_DIR}
+                    ${GUI_SOURCE_DIR_REL}/Base
+                    ${GUI_SOURCE_DIR_REL}/DataView)
 
 file(GLOB_RECURSE UIS CONFIGURE_DEPENDS *.ui)
 source_group("UI Files" FILES ${UIS})
 
-add_library(QtDiagramView
-    ${SOURCES}
-    ${HEADERS}
-    ${UIS}
-)
+add_library(QtDiagramView ${SOURCES} ${HEADERS} ${UIS})
 if(BUILD_SHARED_LIBS)
     install(TARGETS QtDiagramView LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
 
 target_link_libraries(QtDiagramView
-    PRIVATE BaseLib GeoLib QtBase DataHolderLib Qt5::Gui logog
-)
+                      PRIVATE BaseLib
+                              GeoLib
+                              QtBase
+                              DataHolderLib
+                              Qt5::Gui
+                              logog)
 
 add_autogen_include(QtDiagramView)
 
diff --git a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
index b17d9286bc78316d7f54fa194a01ee11abc13f24..e88986209cab8d87195b0f9fb13ff5152d38490b 100644
--- a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
@@ -1,42 +1,29 @@
-set(SOURCES
-    StratBar.cpp
-    StratScene.cpp
-    StratView.cpp
-    StratWindow.cpp
-)
+set(SOURCES StratBar.cpp StratScene.cpp StratView.cpp StratWindow.cpp)
 
-set(HEADERS
-    StratBar.h
-    StratScene.h
-    StratView.h
-    StratWindow.h
-)
+set(HEADERS StratBar.h StratScene.h StratView.h StratWindow.h)
 
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../..)
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${SOURCE_DIR_REL}/BaseLib
-    ${SOURCE_DIR_REL}/GeoLib
-    ${SOURCE_DIR_REL}/MathLib
-    ${GUI_SOURCE_DIR_REL}/Base
-)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+                    ${SOURCE_DIR_REL}/BaseLib
+                    ${SOURCE_DIR_REL}/GeoLib
+                    ${SOURCE_DIR_REL}/MathLib
+                    ${GUI_SOURCE_DIR_REL}/Base)
 
 file(GLOB_RECURSE UI_FILES CONFIGURE_DEPENDS *.ui)
 source_group("UI Files" FILES ${UI_FILES})
 
-add_library(QtStratView
-    ${SOURCES}
-    ${HEADERS}
-    ${UIS}
-)
+add_library(QtStratView ${SOURCES} ${HEADERS} ${UIS})
 if(BUILD_SHARED_LIBS)
     install(TARGETS QtStratView LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
 
 target_link_libraries(QtStratView
-    PRIVATE BaseLib GeoLib DataHolderLib QtBase Qt5::Gui
-)
+                      PRIVATE BaseLib
+                              GeoLib
+                              DataHolderLib
+                              QtBase
+                              Qt5::Gui)
 add_autogen_include(QtStratView)
 
 set_property(TARGET QtStratView PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/DataExplorer/NetCdfDialog/CMakeLists.txt b/Applications/DataExplorer/NetCdfDialog/CMakeLists.txt
index 0d74f1e40cb7605e0c69f16a2a161b3216e1a197..68c16fb9c323457236c350ec484c3d112dc96cab 100644
--- a/Applications/DataExplorer/NetCdfDialog/CMakeLists.txt
+++ b/Applications/DataExplorer/NetCdfDialog/CMakeLists.txt
@@ -1,14 +1,18 @@
 add_library(NetCdfDialogLib NetCdfConfigureDialog.cpp NetCdfConfigureDialog.h)
 if(BUILD_SHARED_LIBS)
-    install(TARGETS NetCdfConfigureDialog LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    install(TARGETS NetCdfConfigureDialog
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
-target_link_libraries(NetCdfDialogLib PUBLIC Qt5::Widgets PRIVATE MathLib vtknetcdfcpp)
+target_link_libraries(NetCdfDialogLib
+                      PUBLIC Qt5::Widgets
+                      PRIVATE MathLib vtknetcdfcpp)
 set_property(TARGET NetCdfDialogLib PROPERTY FOLDER "DataExplorer")
 
 # Workaround for system installed VTK (tested on arch)
 if(NOT OGS_USE_CONAN)
-    target_include_directories(NetCdfDialogLib SYSTEM
+    target_include_directories(
+        NetCdfDialogLib SYSTEM
         PUBLIC ${VTK_INSTALL_PREFIX}/include/vtk/vtknetcdfcpp)
 endif()
 
-add_autogen_include(NetCdfDialogLib)
\ No newline at end of file
+add_autogen_include(NetCdfDialogLib)
diff --git a/Applications/DataExplorer/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt
index d8bb0b9b8e3de392162bbfeac18644fe2fcbd93f..cb0841b1950dcbd653da029903ce3641afb1e2df 100644
--- a/Applications/DataExplorer/VtkVis/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt
@@ -46,8 +46,7 @@ set(SOURCES
     VtkVisPipelineItem.cpp
     VtkVisPipelineView.cpp
     VtkVisPointSetItem.cpp
-    VtkVisTabWidget.cpp
-)
+    VtkVisTabWidget.cpp)
 
 set(HEADERS
     MeshFromRasterDialog.h
@@ -97,8 +96,7 @@ set(HEADERS
     VtkVisPipelineItem.h
     VtkVisPipelineView.h
     VtkVisPointSetItem.h
-    VtkVisTabWidget.h
-)
+    VtkVisTabWidget.h)
 
 # Visual Studio folder
 source_group("Filter Header Files" REGULAR_EXPRESSION "[.]*Filter.h")
@@ -110,24 +108,18 @@ source_group("UI Files" FILES ${UIS})
 
 set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/..)
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${SOURCE_DIR_REL}/Applications/FileIO
-    ${SOURCE_DIR_REL}/BaseLib
-    ${SOURCE_DIR_REL}/GeoLib
-    ${SOURCE_DIR_REL}/MathLib
-    ${SOURCE_DIR_REL}/MeshLib
-    ${GUI_SOURCE_DIR_REL}/Base
-    ${GUI_SOURCE_DIR_REL}/DataView
-    ${GUI_SOURCE_DIR_REL}/VtkModules/Qt
-)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+                    ${CMAKE_CURRENT_BINARY_DIR}
+                    ${SOURCE_DIR_REL}/Applications/FileIO
+                    ${SOURCE_DIR_REL}/BaseLib
+                    ${SOURCE_DIR_REL}/GeoLib
+                    ${SOURCE_DIR_REL}/MathLib
+                    ${SOURCE_DIR_REL}/MeshLib
+                    ${GUI_SOURCE_DIR_REL}/Base
+                    ${GUI_SOURCE_DIR_REL}/DataView
+                    ${GUI_SOURCE_DIR_REL}/VtkModules/Qt)
 
-add_library(VtkVis
-    ${SOURCES}
-    ${HEADERS}
-    ${UIS}
-)
+add_library(VtkVis ${SOURCES} ${HEADERS} ${UIS})
 if(BUILD_SHARED_LIBS)
     install(TARGETS VtkVis LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
@@ -138,11 +130,15 @@ if(GEOTIFF_FOUND)
 endif() # GEOTIFF_FOUND
 
 target_link_libraries(VtkVis
-    PUBLIC BaseLib GeoLib MeshLib DataHolderLib QtBase vtkIOImage
-    PRIVATE MathLib ApplicationsFileIO Qt5::Gui logog
-)
+                      PUBLIC BaseLib
+                             GeoLib
+                             MeshLib
+                             DataHolderLib
+                             QtBase
+                             vtkIOImage
+                      PRIVATE MathLib ApplicationsFileIO Qt5::Gui logog)
 
-if (OGS_USE_NETCDF)
+if(OGS_USE_NETCDF)
     target_link_libraries(VtkVis PRIVATE NetCdfDialogLib)
 endif()
 
diff --git a/Applications/DataHolderLib/CMakeLists.txt b/Applications/DataHolderLib/CMakeLists.txt
index 7f23991438fc1a3a044092b23a3e2e4236e3907e..40e7e38bd433a935a2063b0e0f12f04e5aafc2da 100644
--- a/Applications/DataHolderLib/CMakeLists.txt
+++ b/Applications/DataHolderLib/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Source files
-GET_SOURCE_FILES(SOURCES_DataHolderLib)
+get_source_files(SOURCES_DataHolderLib)
 
 # Library
 add_library(DataHolderLib ${SOURCES_DataHolderLib})
@@ -7,10 +7,7 @@ if(BUILD_SHARED_LIBS)
     install(TARGETS DataHolderLib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
 
-target_link_libraries(DataHolderLib
-    PUBLIC GeoLib MeshLib
-    PRIVATE BaseLib logog
-)
+target_link_libraries(DataHolderLib PUBLIC GeoLib MeshLib PRIVATE BaseLib logog)
 
 if(OGS_USE_PCH)
     cotire(DataHolderLib)
diff --git a/Applications/FileIO/CMakeLists.txt b/Applications/FileIO/CMakeLists.txt
index eaaed88a542e0d7c55ec7e10c2c56e1d73976690..95d05766e9410b1dae48fb7485cbd5d95682c94a 100644
--- a/Applications/FileIO/CMakeLists.txt
+++ b/Applications/FileIO/CMakeLists.txt
@@ -1,23 +1,23 @@
-GET_SOURCE_FILES(SOURCES)
-APPEND_SOURCE_FILES(SOURCES Gmsh)
-APPEND_SOURCE_FILES(SOURCES Legacy)
+get_source_files(SOURCES)
+append_source_files(SOURCES Gmsh)
+append_source_files(SOURCES Legacy)
 
 if(NOT Shapelib_FOUND)
     list(REMOVE_ITEM SOURCES SHPInterface.h SHPInterface.cpp)
 endif()
 
 # GO2OGS
-GET_SOURCE_FILES(SOURCES_GO2OGS GocadIO)
+get_source_files(SOURCES_GO2OGS GocadIO)
 set(SOURCES ${SOURCES} ${SOURCES_GO2OGS})
 
 if(OGS_BUILD_GUI)
-    APPEND_SOURCE_FILES(SOURCES XmlIO/Qt)
-    APPEND_SOURCE_FILES(SOURCES FEFLOW)
+    append_source_files(SOURCES XmlIO/Qt)
+    append_source_files(SOURCES FEFLOW)
 endif()
 
 if(OGS_BUILD_SWMM)
-    GET_SOURCE_FILES(SOURCES_SWMM SWMM)
-    SET(SOURCES ${SOURCES} ${SOURCES_SWMM})
+    get_source_files(SOURCES_SWMM SWMM)
+    set(SOURCES ${SOURCES} ${SOURCES_SWMM})
 endif()
 
 include(${PROJECT_SOURCE_DIR}/scripts/cmake/OGSEnabledElements.cmake)
@@ -25,12 +25,16 @@ include(${PROJECT_SOURCE_DIR}/scripts/cmake/OGSEnabledElements.cmake)
 # Create the library
 add_library(ApplicationsFileIO ${SOURCES})
 if(BUILD_SHARED_LIBS)
-    install(TARGETS ApplicationsFileIO LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    install(TARGETS ApplicationsFileIO
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
 target_link_libraries(ApplicationsFileIO
-    PUBLIC BaseLib DataHolderLib GeoLib MathLib logog
-    PRIVATE MeshLib
-)
+                      PUBLIC BaseLib
+                             DataHolderLib
+                             GeoLib
+                             MathLib
+                             logog
+                      PRIVATE MeshLib)
 
 if(OGS_BUILD_GUI)
     # Needed for the XmlPrjInterface, which links the DE/Base/OGSError.h.
@@ -49,13 +53,13 @@ if(OGS_USE_PCH)
     cotire(ApplicationsFileIO)
 endif()
 
-
-configure_file(XmlIO/OpenGeoSysCND.xsd ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OpenGeoSysCND.xsd COPYONLY)
-configure_file(XmlIO/OpenGeoSysNum.xsd ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OpenGeoSysNum.xsd COPYONLY)
-configure_file(XmlIO/OpenGeoSysProject.xsd ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OpenGeoSysProject.xsd COPYONLY)
-install(FILES
-    XmlIO/OpenGeoSysCND.xsd
-    XmlIO/OpenGeoSysNum.xsd
-    XmlIO/OpenGeoSysProject.xsd
-    DESTINATION bin COMPONENT ogs_cli
-)
+configure_file(XmlIO/OpenGeoSysCND.xsd
+               ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OpenGeoSysCND.xsd COPYONLY)
+configure_file(XmlIO/OpenGeoSysNum.xsd
+               ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OpenGeoSysNum.xsd COPYONLY)
+configure_file(XmlIO/OpenGeoSysProject.xsd
+               ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/OpenGeoSysProject.xsd COPYONLY)
+install(FILES XmlIO/OpenGeoSysCND.xsd XmlIO/OpenGeoSysNum.xsd
+              XmlIO/OpenGeoSysProject.xsd
+        DESTINATION bin
+        COMPONENT ogs_cli)
diff --git a/Applications/FileIO/GocadIO/CMakeLists.txt b/Applications/FileIO/GocadIO/CMakeLists.txt
index 7ca90dceddc1db1c45a524b9f51cf6db2fc3ea36..a5d9d3df2e5ab3244a727ad11138e441c49f6ecb 100644
--- a/Applications/FileIO/GocadIO/CMakeLists.txt
+++ b/Applications/FileIO/GocadIO/CMakeLists.txt
@@ -1,6 +1,2 @@
-include_directories(
-    ${CMAKE_SOURCE_DIR}/BaseLib
-    ${CMAKE_SOURCE_DIR}/FileIO
-    ${CMAKE_SOURCE_DIR}/GeoLib
-    ${CMAKE_SOURCE_DIR}/MeshLib
-)
+include_directories(${CMAKE_SOURCE_DIR}/BaseLib ${CMAKE_SOURCE_DIR}/FileIO
+                    ${CMAKE_SOURCE_DIR}/GeoLib ${CMAKE_SOURCE_DIR}/MeshLib)
diff --git a/Applications/InSituLib/CMakeLists.txt b/Applications/InSituLib/CMakeLists.txt
index 486ef6cba61fbcf5841079612d1b91378f172cc5..3103fa1a1c2c9d4cdddae6942d5465679e761e6e 100644
--- a/Applications/InSituLib/CMakeLists.txt
+++ b/Applications/InSituLib/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Source files
-GET_SOURCE_FILES(SOURCES)
+get_source_files(SOURCES)
 
 # Library
 add_library(InSituLib ${SOURCES})
diff --git a/Applications/Utils/FileConverter/CMakeLists.txt b/Applications/Utils/FileConverter/CMakeLists.txt
index d280d8c55580d43be7c9d3ae8ddb6da8006e8ede..aac2917cb5cc906a184240f4c146e9627001b4b3 100644
--- a/Applications/Utils/FileConverter/CMakeLists.txt
+++ b/Applications/Utils/FileConverter/CMakeLists.txt
@@ -1,23 +1,23 @@
-if (OGS_BUILD_GUI)
-    if (Shapelib_FOUND)
+if(OGS_BUILD_GUI)
+    if(Shapelib_FOUND)
         add_executable(ConvertSHPToGLI ConvertSHPToGLI.cpp)
         set_target_properties(ConvertSHPToGLI PROPERTIES FOLDER Utilities)
-        target_link_libraries(ConvertSHPToGLI GeoLib Qt5::Xml ${Shapelib_LIBRARIES})
+        target_link_libraries(ConvertSHPToGLI GeoLib Qt5::Xml
+                              ${Shapelib_LIBRARIES})
     endif()
 
     add_executable(FEFLOW2OGS FEFLOW2OGS.cpp)
     set_target_properties(FEFLOW2OGS PROPERTIES FOLDER Utilities)
     target_link_libraries(FEFLOW2OGS ApplicationsFileIO)
-endif ()
+endif()
 
 add_executable(convertGEO convertGEO.cpp)
 set_target_properties(convertGEO PROPERTIES FOLDER Utilities)
 target_link_libraries(convertGEO GeoLib ApplicationsFileIO)
 
-add_executable(generateMatPropsFromMatID generateMatPropsFromMatID.cpp )
+add_executable(generateMatPropsFromMatID generateMatPropsFromMatID.cpp)
 target_link_libraries(generateMatPropsFromMatID MeshLib)
-set_target_properties(generateMatPropsFromMatID
-    PROPERTIES FOLDER Utilities)
+set_target_properties(generateMatPropsFromMatID PROPERTIES FOLDER Utilities)
 
 add_executable(GMSH2OGS GMSH2OGS.cpp)
 set_target_properties(GMSH2OGS PROPERTIES FOLDER Utilities)
@@ -46,50 +46,44 @@ target_link_libraries(TecPlotTools GeoLib MeshLib)
 add_executable(GocadSGridReader GocadSGridReaderMain.cpp)
 set_target_properties(GocadSGridReader PROPERTIES FOLDER Utilities)
 target_link_libraries(GocadSGridReader
-    GeoLib
-    MeshLib
-    ApplicationsFileIO
-    ${Boost_LIBRARIES}
-)
+                      GeoLib
+                      MeshLib
+                      ApplicationsFileIO
+                      ${Boost_LIBRARIES})
 
 add_executable(GocadTSurfaceReader GocadTSurfaceReader.cpp)
 set_target_properties(GocadTSurfaceReader PROPERTIES FOLDER Utilities)
-target_link_libraries(GocadTSurfaceReader
-    MeshLib
-    ApplicationsFileIO
-    ${Boost_LIBRARIES}
-)
+target_link_libraries(GocadTSurfaceReader MeshLib ApplicationsFileIO
+                      ${Boost_LIBRARIES})
 
 add_executable(Mesh2Raster MeshToRaster.cpp)
 set_target_properties(Mesh2Raster PROPERTIES FOLDER Utilities)
 target_link_libraries(Mesh2Raster MeshLib)
 
-
-####################
-### Installation ###
-####################
-install(TARGETS
-    generateMatPropsFromMatID
-    GMSH2OGS
-    OGS2VTK
-    VTK2OGS
-    VTK2TIN
-    TecPlotTools
-    GocadSGridReader
-    Mesh2Raster
-    RUNTIME DESTINATION bin COMPONENT ogs_converter)
+# ---- Installation ----
+install(TARGETS generateMatPropsFromMatID
+                GMSH2OGS
+                OGS2VTK
+                VTK2OGS
+                VTK2TIN
+                TecPlotTools
+                GocadSGridReader
+                Mesh2Raster
+        RUNTIME DESTINATION bin COMPONENT ogs_converter)
 
 if(OGS_BUILD_GUI)
     if(Shapelib_FOUND)
         install(TARGETS ConvertSHPToGLI
-            RUNTIME DESTINATION bin COMPONENT ogs_converter)
+                RUNTIME DESTINATION bin COMPONENT ogs_converter)
     endif()
-    install(TARGETS  FEFLOW2OGS convertGEO
-        RUNTIME DESTINATION bin COMPONENT ogs_converter)
+    install(TARGETS FEFLOW2OGS convertGEO
+            RUNTIME DESTINATION bin COMPONENT ogs_converter)
 endif()
 
 cpack_add_component(ogs_converter
-    DISPLAY_NAME "File converter"
-    DESCRIPTION "File converter."
-    GROUP Utilities
-)
+                    DISPLAY_NAME
+                    "File converter"
+                    DESCRIPTION
+                    "File converter."
+                    GROUP
+                    Utilities)
diff --git a/Applications/Utils/GeoTools/CMakeLists.txt b/Applications/Utils/GeoTools/CMakeLists.txt
index e65cb74e20e3a86c5c20d2cbf6aa875d3cc26e40..a721629a0e49f0cc8bd63e97cf8b7607aeea25fa 100644
--- a/Applications/Utils/GeoTools/CMakeLists.txt
+++ b/Applications/Utils/GeoTools/CMakeLists.txt
@@ -2,10 +2,7 @@ if(NOT OGS_BUILD_GUI)
     return()
 endif()
 
-set(TOOLS
-    MoveGeometry
-    TriangulatePolyline
-)
+set(TOOLS MoveGeometry TriangulatePolyline)
 foreach(TOOL ${TOOLS})
     add_executable(${TOOL} ${TOOL}.cpp)
     target_link_libraries(${TOOL} GeoLib ApplicationsFileIO Qt5::Core)
diff --git a/Applications/Utils/MeshEdit/CMakeLists.txt b/Applications/Utils/MeshEdit/CMakeLists.txt
index 680fe9173ffcf074807da5f5a1546cab1098a279..780ee023752e53f9f5d4e3bac0efd0c52e1fed2c 100644
--- a/Applications/Utils/MeshEdit/CMakeLists.txt
+++ b/Applications/Utils/MeshEdit/CMakeLists.txt
@@ -17,8 +17,7 @@ set(TOOLS
     ResetPropertiesInPolygonalRegion
     reviseMesh
     swapNodeCoordinateAxes
-    UnityPreprocessing
-)
+    UnityPreprocessing)
 foreach(TOOL ${TOOLS})
     add_executable(${TOOL} ${TOOL}.cpp)
     target_link_libraries(${TOOL} MeshLib)
@@ -26,8 +25,10 @@ endforeach()
 set_target_properties(${TOOLS} PROPERTIES FOLDER Utilities)
 install(TARGETS ${TOOLS} RUNTIME DESTINATION bin COMPONENT Utilities)
 
-target_link_libraries(appendLinesAlongPolyline MeshGeoToolsLib ApplicationsFileIO)
-target_link_libraries(CreateBoundaryConditionsAlongPolylines MeshGeoToolsLib ApplicationsFileIO)
+target_link_libraries(appendLinesAlongPolyline MeshGeoToolsLib
+                      ApplicationsFileIO)
+target_link_libraries(CreateBoundaryConditionsAlongPolylines MeshGeoToolsLib
+                      ApplicationsFileIO)
 target_link_libraries(createLayeredMeshFromRasters ApplicationsFileIO)
 target_link_libraries(MapGeometryToMeshSurface MeshGeoToolsLib)
 target_link_libraries(ResetPropertiesInPolygonalRegion ApplicationsFileIO)
diff --git a/Applications/Utils/MeshGeoTools/CMakeLists.txt b/Applications/Utils/MeshGeoTools/CMakeLists.txt
index 240aff55f602b4579385708c9b247140ece97ed2..c5b69d1e445070fd097c89810d2aa1eaeaa8fd14 100644
--- a/Applications/Utils/MeshGeoTools/CMakeLists.txt
+++ b/Applications/Utils/MeshGeoTools/CMakeLists.txt
@@ -1,8 +1,5 @@
-set(TOOLS
-    computeSurfaceNodeIDsInPolygonalRegion
-    constructMeshesFromGeometry
-    identifySubdomains
-)
+set(TOOLS computeSurfaceNodeIDsInPolygonalRegion constructMeshesFromGeometry
+          identifySubdomains)
 foreach(TOOL ${TOOLS})
     add_executable(${TOOL} ${TOOL}.cpp)
     target_link_libraries(${TOOL} MeshLib ApplicationsFileIO MeshGeoToolsLib)
diff --git a/Applications/Utils/ModelPreparation/CMakeLists.txt b/Applications/Utils/ModelPreparation/CMakeLists.txt
index 54bf77437d50a79583126aff384f15a3b32cedd5..2433d9ab5f6d9f134183436014e8d0f3271346bf 100644
--- a/Applications/Utils/ModelPreparation/CMakeLists.txt
+++ b/Applications/Utils/ModelPreparation/CMakeLists.txt
@@ -1,9 +1,5 @@
-set(TOOLS
-    ComputeNodeAreasFromSurfaceMesh
-    convertVtkDataArrayToVtkDataArray
-    createNeumannBc
-    scaleProperty
-)
+set(TOOLS ComputeNodeAreasFromSurfaceMesh convertVtkDataArrayToVtkDataArray
+          createNeumannBc scaleProperty)
 foreach(TOOL ${TOOLS})
     add_executable(${TOOL} ${TOOL}.cpp)
     target_link_libraries(${TOOL} MeshLib)
diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt
index 54361c9e05689418a01f545a0fee4a0dca615f80..ec758b6a05f930d0c1ee726b246c38938d34536a 100644
--- a/Applications/Utils/OGSFileConverter/CMakeLists.txt
+++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt
@@ -1,33 +1,24 @@
-add_library(OGSFileConverterLib
-    FileListDialog.h
-    OGSFileConverter.h
-    FileListDialog.cpp
-    OGSFileConverter.cpp
-)
+add_library(OGSFileConverterLib FileListDialog.h OGSFileConverter.h
+                                FileListDialog.cpp OGSFileConverter.cpp)
 target_link_libraries(OGSFileConverterLib
-    PUBLIC ApplicationsFileIO MathLib QtBase ${VTK_LIBRARIES}
-    INTERFACE MeshLib
-)
+                      PUBLIC ApplicationsFileIO MathLib QtBase ${VTK_LIBRARIES}
+                      INTERFACE MeshLib)
 if(BUILD_SHARED_LIBS)
-    install(TARGETS OGSFileConverterLib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    install(TARGETS OGSFileConverterLib
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
 
-set_target_properties(OGSFileConverterLib PROPERTIES
-    AUTOMOC TRUE
-    AUTOUIC TRUE
-)
+set_target_properties(OGSFileConverterLib PROPERTIES AUTOMOC TRUE AUTOUIC TRUE)
 
 add_executable(OGSFileConverter main.cpp)
 
 target_link_libraries(OGSFileConverter
-    PUBLIC OGSFileConverterLib ApplicationsFileIO
-)
+                      PUBLIC OGSFileConverterLib ApplicationsFileIO)
 
 add_autogen_include(OGSFileConverterLib)
 
 set_target_properties(OGSFileConverter OGSFileConverterLib
-    PROPERTIES FOLDER "Utilities"
-)
+                      PROPERTIES FOLDER "Utilities")
 
 if(OGS_USE_PCH)
     cotire(OGSFileConverterLib)
diff --git a/Applications/Utils/PostProcessing/CMakeLists.txt b/Applications/Utils/PostProcessing/CMakeLists.txt
index 06016e3a38b433cd0ffc99e3deb2d9ac4daeeba1..52469fed16de8045ae6eaa58c47fa17e8e26705f 100644
--- a/Applications/Utils/PostProcessing/CMakeLists.txt
+++ b/Applications/Utils/PostProcessing/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 if(OGS_BUILD_PROCESS_LIE)
     add_executable(postLIE postLIE.cpp)
     target_link_libraries(postLIE LIECommon)
diff --git a/Applications/Utils/SWMMConverter/CMakeLists.txt b/Applications/Utils/SWMMConverter/CMakeLists.txt
index 59b62127999a130f10de34d5e3a04a0103baaadb..1b78a128bc835e68dcecb9195a2aeb72230ebabb 100644
--- a/Applications/Utils/SWMMConverter/CMakeLists.txt
+++ b/Applications/Utils/SWMMConverter/CMakeLists.txt
@@ -1,10 +1,9 @@
 add_executable(SWMMConverter SWMMConverter.cpp)
 target_link_libraries(SWMMConverter
-    ApplicationsFileIO
-    GeoLib
-    MeshLib
-    SwmmInterface
-)
-include_directories( ${PROJECT_SOURCE_DIR}/Applications/FileIO )
+                      ApplicationsFileIO
+                      GeoLib
+                      MeshLib
+                      SwmmInterface)
+include_directories(${PROJECT_SOURCE_DIR}/Applications/FileIO)
 set_target_properties(SWMMConverter PROPERTIES FOLDER Utilities)
 install(TARGETS SWMMConverter RUNTIME DESTINATION bin COMPONENT Utilities)
diff --git a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
index 98767fae4f4819cc3d7d535283fada9147e593e4..91562281a1b1b199ae3213e586a7212f783cc65b 100644
--- a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
+++ b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
@@ -1,21 +1,19 @@
-
 if(OGS_BUILD_GUI)
-    add_executable(createMeshElemPropertiesFromASCRaster createMeshElemPropertiesFromASCRaster.cpp)
-    set_target_properties(createMeshElemPropertiesFromASCRaster PROPERTIES FOLDER Utilities)
+    add_executable(createMeshElemPropertiesFromASCRaster
+                   createMeshElemPropertiesFromASCRaster.cpp)
+    set_target_properties(createMeshElemPropertiesFromASCRaster
+                          PROPERTIES FOLDER Utilities)
     target_link_libraries(createMeshElemPropertiesFromASCRaster
-        ApplicationsFileIO
-        MeshLib
-    )
+                          ApplicationsFileIO MeshLib)
 endif()
 
 add_executable(generateStructuredMesh generateStructuredMesh.cpp)
 target_link_libraries(generateStructuredMesh MeshLib)
 set_target_properties(generateStructuredMesh PROPERTIES FOLDER Utilities)
 
-install(TARGETS generateStructuredMesh RUNTIME DESTINATION bin
-    COMPONENT Utilities)
+install(TARGETS generateStructuredMesh
+        RUNTIME DESTINATION bin COMPONENT Utilities)
 if(OGS_BUILD_GUI)
     install(TARGETS createMeshElemPropertiesFromASCRaster
-        RUNTIME DESTINATION bin
-        COMPONENT Utilities)
+            RUNTIME DESTINATION bin COMPONENT Utilities)
 endif()