cmake-format: Allow dangling parenthesis

ApplicationExeCode/CMakeLists.txt

@@ -14,7 +14,8 @@ endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-deprecated-declarations")
+      "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-deprecated-declarations"
+  )
 endif()
 
 # Open GL
@@ -23,7 +24,8 @@ find_package(OpenGL)
 find_package(
   Qt5
   COMPONENTS Core
-  QUIET)
+  QUIET
+)
 
 if(Qt5Core_FOUND)
   find_package(
@@ -38,7 +40,8 @@ if(Qt5Core_FOUND)
                Concurrent
                PrintSupport
                Svg
-    OPTIONAL_COMPONENTS Charts)
+    OPTIONAL_COMPONENTS Charts
+  )
   set(QT_LIBRARIES
       Qt5::Core
       Qt5::Gui
@@ -49,7 +52,8 @@ if(Qt5Core_FOUND)
       Qt5::Xml
       Qt5::Concurrent
       Qt5::PrintSupport
-      Qt5::Svg)
+      Qt5::Svg
+  )
   if(Qt5Charts_FOUND)
     list(APPEND QT_LIBRARIES Qt5::Charts)
   endif(Qt5Charts_FOUND)
@@ -70,12 +74,15 @@ set(CODE_SOURCE_FILES RiaMain.cpp)
 
 if(RESINSIGHT_ENABLE_GRPC)
   list(APPEND CODE_HEAD_FILES RiaGrpcConsoleApplication.h
-       RiaGrpcGuiApplication.h)
+       RiaGrpcGuiApplication.h
+  )
   list(APPEND CODE_SOURCE_FILES RiaGrpcConsoleApplication.cpp
-       RiaGrpcGuiApplication.cpp)
+       RiaGrpcGuiApplication.cpp
+  )
 
   list(APPEND QT_MOC_HEADERS RiaGrpcConsoleApplication.h
-       RiaGrpcGuiApplication.h)
+       RiaGrpcGuiApplication.h
+  )
 
   # Find Protobuf installation Looks for protobuf-config.cmake file installed by
   # Protobuf's cmake installation.
@@ -88,12 +95,14 @@ if(RESINSIGHT_ENABLE_GRPC)
     find_package(gRPC CONFIG REQUIRED)
     set(_PROTOBUF_LIBPROTOBUF protobuf::libprotobuf)
     set(_GRPC_GRPCPP_UNSECURE gRPC::grpc++_unsecure gRPC::grpc_unsecure
-                              gRPC::gpr)
+                              gRPC::gpr
+    )
     set(GRPC_LINK_LIBRARIES ${_GRPC_GRPCPP_UNSECURE} ${_PROTOBUF_LIBPROTOBUF})
   else()
     set(RESINSIGHT_GRPC_INSTALL_PREFIX
         ""
-        CACHE PATH "gRPC : Install prefix for gRPC")
+        CACHE PATH "gRPC : Install prefix for gRPC"
+    )
     set(ENV{PKG_CONFIG_PATH} "${RESINSIGHT_GRPC_INSTALL_PREFIX}/lib/pkgconfig")
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(
@@ -104,7 +113,8 @@ if(RESINSIGHT_ENABLE_GRPC)
       grpc_unsecure
       gpr
       protobuf
-      libcares)
+      libcares
+    )
   endif()
 endif()
 
@@ -156,7 +166,8 @@ set(EXE_FILES
     ${HEADER_FILES}
     ${REFERENCED_CMAKE_FILES}
     .clang-format
-    .clang-tidy)
+    .clang-tidy
+)
 
 add_executable(ResInsight ${EXE_FILES})
 
@@ -165,7 +176,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     ResInsight
     PROPERTIES
       COMPILE_FLAGS
-      "-Wall -Wno-unused-parameter -Wno-reorder -Wno-parentheses -Wno-switch")
+      "-Wall -Wno-unused-parameter -Wno-reorder -Wno-parentheses -Wno-switch"
+  )
   # Treat warnings as errors if asked to do so
   if(RESINSIGHT_TREAT_WARNINGS_AS_ERRORS)
     set_target_properties(
@@ -212,8 +224,9 @@ if(MSVC)
   endif()
 
   message(STATUS "BUILD_FLAGS_FOR_MSVC ${BUILD_FLAGS_FOR_MSVC}")
-  set_target_properties(ResInsight PROPERTIES COMPILE_FLAGS
+  set_target_properties(
-                                              ${BUILD_FLAGS_FOR_MSVC})
+    ResInsight PROPERTIES COMPILE_FLAGS ${BUILD_FLAGS_FOR_MSVC}
+  )
 
 endif()
 
@@ -227,22 +240,27 @@ if(APPLE)
     COMMAND
       sips -s format icns ${CMAKE_CURRENT_SOURCE_DIR}/Resources/AppLogo48x48.png
       --out ${CMAKE_CURRENT_BINARY_DIR}/Resources/ResInsight.icns
-    COMMENT Converting application icon)
+    COMMENT Converting application icon
+  )
   add_custom_target(
     ResInsight-icns
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Resources/ResInsight.icns)
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Resources/ResInsight.icns
+  )
   add_dependencies(ResInsight ResInsight-icns)
   set_target_properties(
     ResInsight PROPERTIES MACOSX_BUNDLE_ICON_FILE
-                          ${CMAKE_CURRENT_BINARY_DIR}/Resources/ResInsight.icns)
+                          ${CMAKE_CURRENT_BINARY_DIR}/Resources/ResInsight.icns
+  )
 endif()
 
 if(RESINSIGHT_ENABLE_GRPC)
   list(APPEND THIRD_PARTY_LIBRARIES ${GRPC_LINK_LIBRARIES})
 
   if(MSVC)
-    set_target_properties(ResInsight PROPERTIES LINK_FLAGS_RELWITHDEBINFO
+    set_target_properties(
-                                                "/NODEFAULTLIB:MSVCRTD.lib")
+      ResInsight PROPERTIES LINK_FLAGS_RELWITHDEBINFO
+                            "/NODEFAULTLIB:MSVCRTD.lib"
+    )
   endif()
 endif()
 
@@ -264,7 +282,8 @@ set(LINK_LIBRARIES
     ${APP_FWK_LIBRARIES}
     ${VIZ_FWK_LIBRARIES}
     ApplicationLibCode
-    Commands)
+    Commands
+)
 
 if(RESINSIGHT_ENABLE_GRPC)
   list(APPEND LINK_LIBRARIES GrpcInterface)
@@ -291,12 +310,14 @@ set(UNITY_EXCLUDE_FILES
     qrc_cafCommandFeatures.cpp
     # Exclude files including opm-common
     ProjectDataModel/RimVfpTableExtractor.cpp
-    ProjectDataModel/RimVfpPlot.cpp)
+    ProjectDataModel/RimVfpPlot.cpp
+)
 
 if(RESINSIGHT_ENABLE_UNITY_BUILD)
   foreach(fileToExclude ${UNITY_EXCLUDE_FILES})
-    set_source_files_properties(${fileToExclude}
+    set_source_files_properties(
-                                PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)
+      ${fileToExclude} PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE
+    )
   endforeach(fileToExclude)
 endif()
 
@@ -330,7 +351,8 @@ if(MSVC)
     set(HDF5_DLL_NAMES hdf5 hdf5_cpp szip zlib)
     foreach(HDF5_DLL_NAME ${HDF5_DLL_NAMES})
       list(APPEND RI_DLL_FILENAMES
-           ${RESINSIGHT_HDF5_DIR}/bin/${HDF5_DLL_NAME}.dll)
+           ${RESINSIGHT_HDF5_DIR}/bin/${HDF5_DLL_NAME}.dll
+      )
     endforeach(HDF5_DLL_NAME)
   endif()
 
@@ -342,7 +364,8 @@ foreach(FILE_TO_COPY ${RI_DLL_FILENAMES})
     TARGET ResInsight
     POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${FILE_TO_COPY}
-            $<TARGET_FILE_DIR:ResInsight>)
+            $<TARGET_FILE_DIR:ResInsight>
+  )
 endforeach()
 
 # Generate Python code in a target that is part of ALL_BUILD and depends on
@@ -355,9 +378,11 @@ if(RESINSIGHT_ENABLE_GRPC)
     OUTPUT ${GENERATED_CLASSES_FILE}
     COMMAND ResInsight ARGS --console --generate ${GENERATED_CLASSES_FILE}
     DEPENDS ResInsight
-    COMMENT "Generating ${GENERATED_CLASSES_FILE}")
+    COMMENT "Generating ${GENERATED_CLASSES_FILE}"
-  add_custom_target(RipsGeneratedPythonClasses ALL
+  )
-                    SOURCES ${GENERATED_CLASSES_FILE})
+  add_custom_target(
+    RipsGeneratedPythonClasses ALL SOURCES ${GENERATED_CLASSES_FILE}
+  )
   source_group("Source Files" ${GENERATED_CLASSES_FILE})
   add_dependencies(RipsGeneratedPythonClasses ResInsight)
 
@@ -369,7 +394,8 @@ if(RESINSIGHT_ENABLE_GRPC)
     COMMAND
       ${CMAKE_COMMAND} -E copy_directory
       "${CMAKE_SOURCE_DIR}/GrpcInterface/Python"
-      $<TARGET_FILE_DIR:ResInsight>/Python)
+      $<TARGET_FILE_DIR:ResInsight>/Python
+  )
 
 endif(RESINSIGHT_ENABLE_GRPC)
 
@@ -389,19 +415,22 @@ if(RESINSIGHT_PRIVATE_INSTALL)
       # different installoptions that does things this way, and really do copy
       # them when doing PRIVATE_INSTALL
       set(RESINSIGHT_INSTALL_RPATH ${RESINSIGHT_INSTALL_RPATH}
-                                   ${RESINSIGHT_ODB_API_DIR}/lib)
+                                   ${RESINSIGHT_ODB_API_DIR}/lib
+      )
     endif()
 
     if(EXISTS ${RESINSIGHT_ERT_EXTERNAL_LIB_ROOT})
       # append the external ERT lib root
       set(RESINSIGHT_INSTALL_RPATH ${RESINSIGHT_INSTALL_RPATH}
-                                   ${RESINSIGHT_ERT_EXTERNAL_LIB_ROOT})
+                                   ${RESINSIGHT_ERT_EXTERNAL_LIB_ROOT}
+      )
     endif()
 
     # message("RESINSIGHT_INSTALL_RPATH : " "${RESINSIGHT_INSTALL_RPATH}")
 
-    set_target_properties(ResInsight PROPERTIES INSTALL_RPATH
+    set_target_properties(
-                                                "${RESINSIGHT_INSTALL_RPATH}")
+      ResInsight PROPERTIES INSTALL_RPATH "${RESINSIGHT_INSTALL_RPATH}"
+    )
 
     # bundle Qt5 libraries
     option(RESINSIGHT_QT5_BUNDLE_LIBRARIES "Bundle Qt5 libraries" OFF)
@@ -413,7 +442,8 @@ if(RESINSIGHT_PRIVATE_INSTALL)
       get_property(
         _filepath
         TARGET "Qt5::Core"
-        PROPERTY LOCATION_RELEASE)
+        PROPERTY LOCATION_RELEASE
+      )
       get_filename_component(_dir ${_filepath} PATH)
 
       foreach(qtlib ${QT_LIBRARIES})
@@ -436,7 +466,8 @@ if(RESINSIGHT_PRIVATE_INSTALL)
         install(
           FILES ${FILE_AND_SYMLINKS}
           DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
-          OPTIONAL)
+          OPTIONAL
+        )
       endforeach()
 
       set(QT_PLUGIN_PATH "$ENV{QT_PLUGIN_PATH}")
@@ -447,21 +478,26 @@ if(RESINSIGHT_PRIVATE_INSTALL)
 
       # include platform files
       install(FILES ${QT_PLUGIN_PATH}/platforms/libqxcb.so
-              DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/platforms/)
+              DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/platforms/
+      )
       install(FILES ${QT_PLUGIN_PATH}/imageformats/libqsvg.so
-              DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/imageformats/)
+              DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/imageformats/
+      )
       install(FILES ${QT_PLUGIN_PATH}/iconengines/libqsvgicon.so
-              DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/iconengines/)
+              DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/iconengines/
+      )
 
       # Required by xcb module used to create OpenGL widgets
       install(
         FILES ${QT_PLUGIN_PATH}/xcbglintegrations/libqxcb-egl-integration.so
         DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/plugins/xcbglintegrations/
-        OPTIONAL)
+        OPTIONAL
+      )
       install(
         FILES ${QT_PLUGIN_PATH}/xcbglintegrations/libqxcb-glx-integration.so
         DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/plugins/xcbglintegrations/
-        OPTIONAL)
+        OPTIONAL
+      )
 
     endif(RESINSIGHT_QT5_BUNDLE_LIBRARIES)
 
@@ -477,14 +513,16 @@ if(RESINSIGHT_PRIVATE_INSTALL)
 
     if(WIN32
        AND TARGET Qt5::qmake
-       AND NOT TARGET Qt5::windeployqt)
+       AND NOT TARGET Qt5::windeployqt
+    )
       get_target_property(_qt5_qmake_location Qt5::qmake IMPORTED_LOCATION)
 
       execute_process(
         COMMAND "${_qt5_qmake_location}" -query QT_INSTALL_PREFIX
         RESULT_VARIABLE return_code
         OUTPUT_VARIABLE qt5_install_prefix
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
 
       set(imported_location "${qt5_install_prefix}/bin/windeployqt.exe")
 
@@ -494,8 +532,9 @@ if(RESINSIGHT_PRIVATE_INSTALL)
       if(EXISTS ${imported_location})
         add_executable(Qt5::windeployqt IMPORTED)
 
-        set_target_properties(Qt5::windeployqt PROPERTIES IMPORTED_LOCATION
+        set_target_properties(
-                                                          ${imported_location})
+          Qt5::windeployqt PROPERTIES IMPORTED_LOCATION ${imported_location}
+        )
       endif()
     endif()
 
@@ -514,7 +553,8 @@ if(RESINSIGHT_PRIVATE_INSTALL)
           Qt5::windeployqt --no-compiler-runtime --no-system-d3d-compiler
           --no-quick-import --no-translations --verbose 0 --dir
           "${CMAKE_CURRENT_BINARY_DIR}/windeployqt"
-          "$<TARGET_FILE_DIR:ResInsight>/$<TARGET_FILE_NAME:ResInsight>")
+          "$<TARGET_FILE_DIR:ResInsight>/$<TARGET_FILE_NAME:ResInsight>"
+      )
 
       # Qt DLLs
       message(STATUS "Creating post build step for copying Qt DLLs")
@@ -527,11 +567,13 @@ if(RESINSIGHT_PRIVATE_INSTALL)
         COMMAND
           ${CMAKE_COMMAND} -E copy_directory
           "${CMAKE_CURRENT_BINARY_DIR}/windeployqt/"
-          $<TARGET_FILE_DIR:ResInsight>)
+          $<TARGET_FILE_DIR:ResInsight>
+      )
 
       # copy deployment directory during installation
       install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/windeployqt/"
-              DESTINATION ${RESINSIGHT_INSTALL_FOLDER})
+              DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
+      )
     endif()
 
     # install GRPC-related DLLs and generated_classes.py
@@ -541,12 +583,14 @@ if(RESINSIGHT_PRIVATE_INSTALL)
       set(GRPC_DLL_NAMES ${PROTOBUF_DLL} cares ${ZLIB_DLL} abseil_dll)
       foreach(dllname ${GRPC_DLL_NAMES})
         install(FILES $<TARGET_FILE_DIR:ResInsight>/${dllname}.dll
-                DESTINATION ${RESINSIGHT_INSTALL_FOLDER})
+                DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
+        )
       endforeach(dllname ${GRPC_DLL_NAMES})
       install(
         FILES
           ${CMAKE_SOURCE_DIR}/GrpcInterface/Python/rips/generated/generated_classes.py
-        DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/Python/rips/generated)
+        DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/Python/rips/generated
+      )
     endif()
 
     # Boost
@@ -555,7 +599,8 @@ if(RESINSIGHT_PRIVATE_INSTALL)
     get_property(
       _filepath
       TARGET "Boost::filesystem"
-      PROPERTY LOCATION_RELEASE)
+      PROPERTY LOCATION_RELEASE
+    )
     message("_filepath: ${_filepath}")
 
     # The location of Boost is based on the file structure as installed by vcpkg
@@ -571,14 +616,16 @@ if(RESINSIGHT_PRIVATE_INSTALL)
     install(
       FILES ${RI_BOOST_DLLS}
       DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
-      CONFIGURATIONS Debug Release RelWithDebInfo)
+      CONFIGURATIONS Debug Release RelWithDebInfo
+    )
 
     # CRT
     set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP ON)
     set(CMAKE_INSTALL_OPENMP_LIBRARIES ON)
     include(InstallRequiredSystemLibraries)
     install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
-            DESTINATION ${RESINSIGHT_INSTALL_FOLDER})
+            DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
+    )
 
   endif()
 
@@ -597,7 +644,8 @@ if(RESINSIGHT_PRIVATE_INSTALL)
         GROUP_READ
         GROUP_EXECUTE
         WORLD_READ
-        WORLD_EXECUTE)
+        WORLD_EXECUTE
+    )
   endif()
 
 else(RESINSIGHT_PRIVATE_INSTALL)
@@ -609,13 +657,17 @@ else(RESINSIGHT_PRIVATE_INSTALL)
   install(
     FILES ${CMAKE_CURRENT_SOURCE_DIR}/Resources/AppLogo48x48.png
     DESTINATION share/icons/hicolor/48x48/apps
-    RENAME ResInsight.png)
+    RENAME ResInsight.png
+  )
   # desktop environment icon; remember to call `update-desktop-database` in
   # package post-install scripts
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resinsight.desktop.in
+  configure_file(
-                 ${CMAKE_CURRENT_BINARY_DIR}/resinsight.desktop @ONLY)
+    ${CMAKE_CURRENT_SOURCE_DIR}/resinsight.desktop.in
+    ${CMAKE_CURRENT_BINARY_DIR}/resinsight.desktop @ONLY
+  )
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/resinsight.desktop
-          DESTINATION share/applications)
+          DESTINATION share/applications
+  )
 endif(RESINSIGHT_PRIVATE_INSTALL)
 
 # OpenSSL
@@ -633,25 +685,32 @@ if(RESINSIGHT_BUNDLE_OPENSSL)
       message("OpenSSL binary dir: ${OPENSSL_BIN_DIR}")
 
       install(FILES ${OPENSSL_BIN_DIR}/libcrypto-1_1-x64.dll
-              DESTINATION ${RESINSIGHT_INSTALL_FOLDER})
+              DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
+      )
       install(FILES ${OPENSSL_BIN_DIR}/libssl-1_1-x64.dll
-              DESTINATION ${RESINSIGHT_INSTALL_FOLDER})
+              DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
+      )
     endif(OPENSSL_FOUND)
   elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     # Assumes that OpenSSL is installed by ./vcpkg install
     # --overlay-triplets=custom-triplets --triplet x64-linux-dynamic openssl
     set(OPENSSL_BIN_DIR
-        ${CMAKE_SOURCE_DIR}/ThirdParty/vcpkg/installed/x64-linux-dynamic/lib)
+        ${CMAKE_SOURCE_DIR}/ThirdParty/vcpkg/installed/x64-linux-dynamic/lib
+    )
     message("OpenSSL binary dir: ${OPENSSL_BIN_DIR}")
 
     install(FILES ${OPENSSL_BIN_DIR}/libcrypto.so
-            DESTINATION ${RESINSIGHT_INSTALL_FOLDER})
+            DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
+    )
     install(FILES ${OPENSSL_BIN_DIR}/libcrypto.so.1.1
-            DESTINATION ${RESINSIGHT_INSTALL_FOLDER})
+            DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
+    )
     install(FILES ${OPENSSL_BIN_DIR}/libssl.so
-            DESTINATION ${RESINSIGHT_INSTALL_FOLDER})
+            DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
+    )
     install(FILES ${OPENSSL_BIN_DIR}/libssl.so.1.1
-            DESTINATION ${RESINSIGHT_INSTALL_FOLDER})
+            DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
+    )
   endif()
 endif(RESINSIGHT_BUNDLE_OPENSSL)
 
@@ -687,7 +746,8 @@ endif()
 
 if(NOT ${OCTAVE_VERSION_STRING} EQUAL "")
   set(RESINSIGHT_PACKAGE_NAME
-      "${RESINSIGHT_PACKAGE_NAME}_oct-${OCTAVE_VERSION_STRING}")
+      "${RESINSIGHT_PACKAGE_NAME}_oct-${OCTAVE_VERSION_STRING}"
+  )
 endif()
 
 if(RESINSIGHT_BUNDLE_OPENSSL AND OPENSSL_FOUND)
@@ -697,7 +757,8 @@ endif()
 # Append el5 when compiled on RHEL5 and el6 if compiled on RHEL6
 if(NOT "${RESINSIGHT_RHEL_SYSTEM_NAME}" STREQUAL "")
   set(RESINSIGHT_PACKAGE_NAME
-      "${RESINSIGHT_PACKAGE_NAME}_${RESINSIGHT_RHEL_SYSTEM_NAME}")
+      "${RESINSIGHT_PACKAGE_NAME}_${RESINSIGHT_RHEL_SYSTEM_NAME}"
+  )
 else()
   set(RESINSIGHT_PACKAGE_NAME "${RESINSIGHT_PACKAGE_NAME}_${CPACK_SYSTEM_NAME}")
 endif()

ApplicationLibCode/Application/CMakeLists_files.cmake

@@ -22,7 +22,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiaNncDefines.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaStimPlanModelDefines.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaResultNames.h
-    ${CMAKE_CURRENT_LIST_DIR}/RiaNumberFormat.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RiaNumberFormat.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiaApplication.cpp
@@ -48,7 +49,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiaNncDefines.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaStimPlanModelDefines.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaResultNames.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RiaNumberFormat.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RiaNumberFormat.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -60,8 +62,10 @@ set(QT_MOC_HEADERS
     ${CMAKE_CURRENT_LIST_DIR}/RiaGuiApplication.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaCompletionTypeCalculationScheduler.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaViewRedrawScheduler.h
-    ${CMAKE_CURRENT_LIST_DIR}/RiaPlotWindowRedrawScheduler.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RiaPlotWindowRedrawScheduler.h
+)
 
 source_group(
   "Application" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-                      ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+                      ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Application/Tools/CMakeLists_files.cmake

@@ -44,7 +44,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiaWellLogUnitTools.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaWellLogUnitTools.inl
     ${CMAKE_CURRENT_LIST_DIR}/RiaTimeTTools.h
-    ${CMAKE_CURRENT_LIST_DIR}/RiaValidRegExpValidator.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RiaValidRegExpValidator.h
+)
 
 set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiaArgumentParser.h
@@ -93,7 +94,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiaWellLogUnitTools.inl
     ${CMAKE_CURRENT_LIST_DIR}/RiaTimeTTools.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaValidRegExpValidator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RiaEnsembleNameTools.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RiaEnsembleNameTools.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiaArgumentParser.cpp
@@ -135,7 +137,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiaBoundingBoxTools.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaTimeTTools.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaValidRegExpValidator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RiaEnsembleNameTools.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RiaEnsembleNameTools.cpp
+)
 
 list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 
@@ -144,4 +147,5 @@ set(QT_MOC_HEADERS ${QT_MOC_HEADERS})
 source_group(
   "Application\\Tools"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Application/Tools/WellPathTools/CMakeLists_files.cmake

@@ -4,7 +4,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiaSCurveCalculator.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaArcCurveCalculator.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaJCurveCalculator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RiaLineArcWellPathCalculator.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RiaLineArcWellPathCalculator.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiaPolyArcLineSampler.cpp
@@ -12,7 +13,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiaSCurveCalculator.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaArcCurveCalculator.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaJCurveCalculator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RiaLineArcWellPathCalculator.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RiaLineArcWellPathCalculator.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -23,4 +25,5 @@ set(QT_MOC_HEADERS ${QT_MOC_HEADERS})
 source_group(
   "Application\\Tools\\WellPathTools"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/CMakeLists.txt

@@ -14,19 +14,22 @@ endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-deprecated-declarations")
+      "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-deprecated-declarations"
+  )
 endif()
 
 # Open GL
 find_package(OpenGL)
 
 option(RESINSIGHT_TREAT_WARNINGS_AS_ERRORS
-       "Treat warnings as errors (stops build)" OFF)
+       "Treat warnings as errors (stops build)" OFF
+)
 
 find_package(
   Qt5
   COMPONENTS Core
-  QUIET)
+  QUIET
+)
 
 if(Qt5Core_FOUND)
   find_package(
@@ -41,7 +44,8 @@ if(Qt5Core_FOUND)
                Concurrent
                PrintSupport
                Svg
-    OPTIONAL_COMPONENTS Charts)
+    OPTIONAL_COMPONENTS Charts
+  )
   set(QT_LIBRARIES
       Qt5::Core
       Qt5::Gui
@@ -52,7 +56,8 @@ if(Qt5Core_FOUND)
       Qt5::Xml
       Qt5::Concurrent
       Qt5::PrintSupport
-      Qt5::Svg)
+      Qt5::Svg
+  )
   if(Qt5Charts_FOUND)
     list(APPEND QT_LIBRARIES Qt5::Charts)
   endif(Qt5Charts_FOUND)
@@ -60,11 +65,15 @@ endif(Qt5Core_FOUND)
 
 # NB: The generated file is written to Cmake binary folder to avoid source tree
 # pollution This folder is added to include_directories
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Adm/RiaVersionInfo.h.cmake
+configure_file(
-               ${CMAKE_BINARY_DIR}/Generated/RiaVersionInfo.h)
+  ${CMAKE_CURRENT_SOURCE_DIR}/Adm/RiaVersionInfo.h.cmake
+  ${CMAKE_BINARY_DIR}/Generated/RiaVersionInfo.h
+)
 
-configure_file(${CMAKE_CURRENT_LIST_DIR}/RiuThemesDirectory.h.cmake
+configure_file(
-               ${CMAKE_BINARY_DIR}/Generated/RiuThemesDirectory.h)
+  ${CMAKE_CURRENT_LIST_DIR}/RiuThemesDirectory.h.cmake
+  ${CMAKE_BINARY_DIR}/Generated/RiuThemesDirectory.h
+)
 if(MSVC)
   # Avoid Qt warnings about macro redefinitions for math constants
   add_definitions(-D_USE_MATH_DEFINES)
@@ -120,7 +129,8 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/GeoMech/GeoMechDataModel
   ${CMAKE_CURRENT_SOURCE_DIR}/GeoMech/GeoMechVisualization
   ${CMAKE_BINARY_DIR}/Generated
-  ${CMAKE_CURRENT_BINARY_DIR})
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
 
 # ##############################################################################
 # Eigen
@@ -147,7 +157,8 @@ set(SOCKET_INTERFACE_FILES
     SocketInterface/RiaPropertyDataCommands.cpp
     SocketInterface/RiaWellDataCommands.cpp
     SocketInterface/RiaSocketTools.cpp
-    SocketInterface/RiaSocketDataTransfer.cpp)
+    SocketInterface/RiaSocketDataTransfer.cpp
+)
 
 list(APPEND CPP_SOURCES ${SOCKET_INTERFACE_FILES} ${UNIT_TEST_FILES})
 
@@ -195,10 +206,12 @@ list(
   UserInterface/CMakeLists_files.cmake
   UserInterface/AnalysisPlots/CMakeLists_files.cmake
   CommandFileInterface/CMakeLists_files.cmake
-  CommandFileInterface/Core/CMakeLists_files.cmake)
+  CommandFileInterface/Core/CMakeLists_files.cmake
+)
 
 option(RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS
-       "Include ApplicationCode Unit Tests" OFF)
+       "Include ApplicationCode Unit Tests" OFF
+)
 mark_as_advanced(FORCE RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS)
 if(RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS)
   add_definitions(-DUSE_UNIT_TESTS)
@@ -206,7 +219,8 @@ if(RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS)
   list(APPEND REFERENCED_CMAKE_FILES UnitTests/CMakeLists_files.cmake)
 
   list(APPEND CPP_SOURCES
-       ${ResInsight_SOURCE_DIR}/ThirdParty/gtest/gtest-all.cc)
+       ${ResInsight_SOURCE_DIR}/ThirdParty/gtest/gtest-all.cc
+  )
 
 endif()
 
@@ -253,7 +267,8 @@ if(RESINSIGHT_FOUND_HDF5)
       FileInterface/RifHdf5Exporter.h
       FileInterface/RifHdf5Exporter.cpp
       FileInterface/RifHdf5SummaryExporter.h
-      FileInterface/RifHdf5SummaryExporter.cpp)
+      FileInterface/RifHdf5SummaryExporter.cpp
+  )
 
   list(APPEND CPP_SOURCES ${HDF5_FILES})
 
@@ -280,7 +295,8 @@ endif()
 
 set(QT_MOC_HEADERS
     ${QT_MOC_HEADERS} ProjectDataModel/RimMimeData.h
-    ProjectDataModel/RimBoxIntersection.h SocketInterface/RiaSocketServer.h)
+    ProjectDataModel/RimBoxIntersection.h SocketInterface/RiaSocketServer.h
+)
 
 qt5_wrap_cpp(MOC_SOURCE_FILES ${QT_MOC_HEADERS})
 qt5_wrap_ui(FORM_FILES_CPP ${QT_UI_FILES})
@@ -303,7 +319,8 @@ list(
   ../ResInsightVersion.cmake
   .clang-format
   .clang-tidy
-  Adm/RiaVersionInfo.h.cmake)
+  Adm/RiaVersionInfo.h.cmake
+)
 
 add_library(${PROJECT_NAME} OBJECT ${ALL_SOURCE_FILES})
 
@@ -315,7 +332,8 @@ if(RESINSIGHT_ENABLE_PRECOMPILED_HEADERS)
 
   set_source_files_properties(
     ${ResInsight_SOURCE_DIR}/ThirdParty/gtest/gtest-all.cc
-    PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
+    PROPERTIES SKIP_PRECOMPILE_HEADERS ON
+  )
 endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -323,7 +341,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     ${PROJECT_NAME}
     PROPERTIES
       COMPILE_FLAGS
-      "-Wall -Wno-unused-parameter -Wno-reorder -Wno-parentheses -Wno-switch")
+      "-Wall -Wno-unused-parameter -Wno-reorder -Wno-parentheses -Wno-switch"
+  )
   # Treat warnings as errors if asked to do so
   if(RESINSIGHT_TREAT_WARNINGS_AS_ERRORS)
     set_target_properties(
@@ -370,8 +389,9 @@ if(MSVC)
   endif()
 
   message(STATUS "BUILD_FLAGS_FOR_MSVC ${BUILD_FLAGS_FOR_MSVC}")
-  set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
+  set_target_properties(
-                                                   ${BUILD_FLAGS_FOR_MSVC})
+    ${PROJECT_NAME} PROPERTIES COMPILE_FLAGS ${BUILD_FLAGS_FOR_MSVC}
+  )
 
 endif()
 
@@ -387,7 +407,8 @@ set(LINK_LIBRARIES
     ${OPM_LIBRARIES}
     ${APP_FWK_LIBRARIES}
     ${VIZ_FWK_LIBRARIES}
-    ${RI_LIBRARIES})
+    ${RI_LIBRARIES}
+)
 
 # According to ivarun this is needed on OpenSuse, and Fedora. See:
 # https://github.com/OPM/ResInsight/pull/7
@@ -395,8 +416,9 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   list(APPEND EXTERNAL_LINK_LIBRARIES rt)
 endif()
 
-target_link_libraries(${PROJECT_NAME} ${LINK_LIBRARIES}
+target_link_libraries(
-                      ${EXTERNAL_LINK_LIBRARIES})
+  ${PROJECT_NAME} ${LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES}
+)
 
 target_include_directories(
   ${PROJECT_NAME}
@@ -413,7 +435,8 @@ target_include_directories(
          ${CMAKE_SOURCE_DIR}/ApplicationLibCode/ProjectDataModel/Flow
          ${CMAKE_SOURCE_DIR}/ApplicationLibCode/ReservoirDataModel
          ${CMAKE_SOURCE_DIR}/ApplicationLibCode/SocketInterface
-         ${CMAKE_SOURCE_DIR}/ApplicationLibCode/UserInterface)
+         ${CMAKE_SOURCE_DIR}/ApplicationLibCode/UserInterface
+)
 
 # ##############################################################################
 # Unity builds
@@ -428,11 +451,13 @@ set(UNITY_EXCLUDE_FILES
     qrc_cafCommandFeatures.cpp
     # Exclude files including opm-common
     ProjectDataModel/RimVfpTableExtractor.cpp
-    ProjectDataModel/RimVfpPlot.cpp)
+    ProjectDataModel/RimVfpPlot.cpp
+)
 
 if(RESINSIGHT_ENABLE_UNITY_BUILD)
   foreach(fileToExclude ${UNITY_EXCLUDE_FILES})
-    set_source_files_properties(${fileToExclude}
+    set_source_files_properties(
-                                PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)
+      ${fileToExclude} PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE
+    )
   endforeach(fileToExclude)
 endif()

ApplicationLibCode/CommandFileInterface/CMakeLists_files.cmake

@@ -36,7 +36,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicfNewWellBoreStabilityPlotFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicfImportWellLogFiles.h
     ${CMAKE_CURRENT_LIST_DIR}/RicfImportFormationNames.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicfExportWellLogPlotData.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicfExportWellLogPlotData.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicfCloseProject.cpp
@@ -76,7 +77,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicfCreateWellBoreStabilityPlotFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicfImportWellLogFiles.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicfImportFormationNames.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicfExportWellLogPlotData.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicfExportWellLogPlotData.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -85,4 +87,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFileInterface"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/CommandFileInterface/Core/CMakeLists_files.cmake

@@ -1,9 +1,11 @@
 set(SOURCE_GROUP_HEADER_FILES ${CMAKE_CURRENT_LIST_DIR}/RicfCommandObject.h
-                              ${CMAKE_CURRENT_LIST_DIR}/RifcCommandFileReader.h)
+                              ${CMAKE_CURRENT_LIST_DIR}/RifcCommandFileReader.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicfCommandObject.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RifcCommandFileReader.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RifcCommandFileReader.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -12,4 +14,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFileInterface\\Core"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/AnalysisPlotCommands/CMakeLists_files.cmake

@@ -1,10 +1,12 @@
 set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewAnalysisPlotFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicNewPlotDataFilterFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewPlotDataFilterFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewAnalysisPlotFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicNewPlotDataFilterFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewPlotDataFilterFeature.cpp
+)
 
 list(APPEND COMMAND_COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -13,4 +15,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\AnalysisPlotCommands"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/AnnotationCommands/CMakeLists_files.cmake

@@ -4,7 +4,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicCreateTextAnnotationIn3dViewFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicCreateReachCircleAnnotationFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicCreateUserDefinedPolylinesAnnotationFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicTextAnnotation3dEditor.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicTextAnnotation3dEditor.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicImportPolylinesAnnotationFeature.cpp
@@ -12,7 +13,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicCreateTextAnnotationIn3dViewFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicCreateReachCircleAnnotationFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicCreateUserDefinedPolylinesAnnotationFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicTextAnnotation3dEditor.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicTextAnnotation3dEditor.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -20,9 +22,11 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 
 set(COMMAND_QT_MOC_HEADERS
     ${COMMAND_QT_MOC_HEADERS}
-    ${CMAKE_CURRENT_LIST_DIR}/RicTextAnnotation3dEditor.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicTextAnnotation3dEditor.h
+)
 
 source_group(
   "CommandFeature\\AnnotationCommands"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/ApplicationCommands/CMakeLists_files.cmake

@@ -18,7 +18,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicDefaultDockConfigEclipseFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicDefaultDockConfigGeoMechFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicExportObjectAndFieldKeywordsFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicSaveProjectNoGlobalPathsFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicSaveProjectNoGlobalPathsFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicLaunchUnitTestsFeature.cpp
@@ -40,7 +41,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicDefaultDockConfigEclipseFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicDefaultDockConfigGeoMechFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicExportObjectAndFieldKeywordsFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicSaveProjectNoGlobalPathsFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicSaveProjectNoGlobalPathsFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -51,4 +53,5 @@ set(COMMAND_QT_MOC_HEADERS ${COMMAND_QT_MOC_HEADERS})
 source_group(
   "CommandFeature\\Application"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/CMakeLists.txt

@@ -40,7 +40,8 @@ set(COMMAND_REFERENCED_CMAKE_FILES
     WellLogCommands/CMakeLists_files.cmake
     WellPathCommands/CMakeLists_files.cmake
     PlotTemplateCommands/CMakeLists_files.cmake
-    FractureCommands/CMakeLists_files.cmake)
+    FractureCommands/CMakeLists_files.cmake
+)
 
 # Include source file lists from *.cmake files
 foreach(referencedfile ${COMMAND_REFERENCED_CMAKE_FILES})
@@ -55,13 +56,15 @@ qt5_wrap_cpp(COMMAND_MOC_SOURCE_FILES ${COMMAND_QT_MOC_HEADERS})
 add_library(
   ${PROJECT_NAME} OBJECT
   ${COMMAND_CODE_SOURCE_FILES} ${COMMAND_CODE_HEADER_FILES}
-  ${COMMAND_MOC_SOURCE_FILES})
+  ${COMMAND_MOC_SOURCE_FILES}
+)
 
 target_include_directories(
   ${PROJECT_NAME}
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/ThirdParty
          ${CMAKE_SOURCE_DIR}/ThirdParty/custom-opm-common/generated-opm-common
-         ${CMAKE_SOURCE_DIR}/ThirdParty/custom-opm-common/opm-common)
+         ${CMAKE_SOURCE_DIR}/ThirdParty/custom-opm-common/opm-common
+)
 
 if(MSVC)
   # The following warnings are supposed to be used in ResInsight, but
@@ -88,8 +91,9 @@ if(MSVC)
     set(BUILD_FLAGS_FOR_MSVC "${BUILD_FLAGS_FOR_MSVC} /wd4505")
   endif()
 
-  set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
+  set_target_properties(
-                                                   ${BUILD_FLAGS_FOR_MSVC})
+    ${PROJECT_NAME} PROPERTIES COMPILE_FLAGS ${BUILD_FLAGS_FOR_MSVC}
+  )
 
 endif()
 
@@ -105,7 +109,8 @@ set(LINK_LIBRARIES
     nightcharts
     qwt
     ${QT_LIBRARIES}
-    Eigen3::Eigen)
+    Eigen3::Eigen
+)
 
 target_link_libraries(${PROJECT_NAME} PRIVATE ${LINK_LIBRARIES})
 

ApplicationLibCode/Commands/CMakeLists_files.cmake

@@ -72,7 +72,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewPressureTableItemFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicDeletePressureTableItemFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicImportGridModelFromSummaryCaseFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicImportGridModelFromSummaryCurveFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicImportGridModelFromSummaryCurveFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicWellLogTools.cpp
@@ -147,17 +148,20 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewPressureTableItemFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicDeletePressureTableItemFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicImportGridModelFromSummaryCaseFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicImportGridModelFromSummaryCurveFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicImportGridModelFromSummaryCurveFeature.cpp
+)
 
 if(Qt5Charts_FOUND)
   list(
     APPEND SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleFractureStatisticsPlotFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicCreateGridStatisticsPlotFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicCreateGridStatisticsPlotFeature.h
+  )
   list(
     APPEND SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleFractureStatisticsPlotFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicCreateGridStatisticsPlotFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicCreateGridStatisticsPlotFeature.cpp
+  )
 endif()
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
@@ -170,9 +174,11 @@ list(
   ${CMAKE_CURRENT_LIST_DIR}/RicGridStatisticsDialog.h
   ${CMAKE_CURRENT_LIST_DIR}/RicRecursiveFileSearchDialog.h
   ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCaseRestartDialog.h
-  ${CMAKE_CURRENT_LIST_DIR}/RicResampleDialog.h)
+  ${CMAKE_CURRENT_LIST_DIR}/RicResampleDialog.h
+)
 
 source_group(
   "CommandFeature"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/CellFilterCommands/CMakeLists_files.cmake

@@ -7,7 +7,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewRangeFilterSliceJFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicNewRangeFilterSliceKFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicNewRangeFilterSlice3dviewFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonFilter3dviewFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonFilter3dviewFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonFilterFeature.cpp
@@ -18,7 +19,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewRangeFilterSliceJFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicNewRangeFilterSliceKFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicNewRangeFilterSlice3dviewFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonFilter3dviewFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewPolygonFilter3dviewFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -27,4 +29,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\CellFilterCommands"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/ColorLegendCommands/CMakeLists_files.cmake

@@ -2,13 +2,15 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicImportColorCategoriesFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicCopyStandardLegendFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicInsertColorLegendFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicInsertColorLegendItemFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicInsertColorLegendItemFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicImportColorCategoriesFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicCopyStandardLegendFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicInsertColorLegendFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicInsertColorLegendItemFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicInsertColorLegendItemFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -17,4 +19,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\ColorLegend"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/CompletionCommands/CMakeLists_files.cmake

@@ -11,7 +11,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicDeleteValveTemplateFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicWellPathImportPerforationIntervalsFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicNewStimPlanModelPlotFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicImportEnsembleFractureStatisticsFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicImportEnsembleFractureStatisticsFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicEditPerforationCollectionFeature.cpp
@@ -26,7 +27,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicDeleteValveTemplateFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicWellPathImportPerforationIntervalsFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicNewStimPlanModelPlotFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicImportEnsembleFractureStatisticsFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicImportEnsembleFractureStatisticsFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -35,4 +37,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\Completion"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/CompletionExportCommands/CMakeLists_files.cmake

@@ -20,7 +20,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicWellPathFractureTextReportFeatureImpl.h
     ${CMAKE_CURRENT_LIST_DIR}/RicWellPathFractureReportItem.h
     ${CMAKE_CURRENT_LIST_DIR}/RicExportCompletionsForTemporaryLgrsFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicMswTableFormatterTools.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicMswTableFormatterTools.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicExportCompletionDataSettingsUi.cpp
@@ -44,7 +45,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicWellPathFractureTextReportFeatureImpl.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicWellPathFractureReportItem.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicExportCompletionsForTemporaryLgrsFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicMswTableFormatterTools.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicMswTableFormatterTools.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -53,4 +55,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\CompletionExport"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/CorrelationPlotCommands/CMakeLists_files.cmake

@@ -2,13 +2,15 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewCorrelationPlotFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicNewCorrelationReportPlotFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicNewCorrelationMatrixPlotFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicNewParameterResultCrossPlotFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewParameterResultCrossPlotFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewCorrelationPlotFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicNewCorrelationMatrixPlotFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicNewParameterResultCrossPlotFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicNewCorrelationReportPlotFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewCorrelationReportPlotFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -17,4 +19,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\CorrelationPlotCommands"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/CrossSectionCommands/CMakeLists_files.cmake

@@ -5,7 +5,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathIntersectionFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicNewPolylineIntersectionFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicNewAzimuthDipIntersectionFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicCopyIntersectionsToAllViewsInCaseFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicCopyIntersectionsToAllViewsInCaseFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicAppendIntersectionFeature.cpp
@@ -14,7 +15,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathIntersectionFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicNewPolylineIntersectionFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicNewAzimuthDipIntersectionFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicCopyIntersectionsToAllViewsInCaseFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicCopyIntersectionsToAllViewsInCaseFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -23,4 +25,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\CrossSection"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/EclipseCommands/CMakeLists_files.cmake

@@ -16,7 +16,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicApplyPropertyFilterAsCellResultFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicImportEclipseCaseTimeStepFilterFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicEclipsePropertyFilterNewInViewFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicEclipseHideFaultFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicEclipseHideFaultFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicAddEclipseInputPropertyFeature.cpp
@@ -36,7 +37,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicApplyPropertyFilterAsCellResultFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicImportEclipseCaseTimeStepFilterFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicEclipsePropertyFilterNewInViewFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicEclipseHideFaultFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicEclipseHideFaultFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -45,4 +47,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\Eclipse"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/EclipseCommands/EclipseWell/CMakeLists_files.cmake

@@ -1,10 +1,12 @@
 set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicEclipseWellFeatureImpl.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicEclipseWellShowFeatures.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicEclipseWellShowFeatures.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicEclipseWellFeatureImpl.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicEclipseWellShowFeatures.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicEclipseWellShowFeatures.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -13,4 +15,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\Eclipse\\Well"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/ExportCommands/CMakeLists_files.cmake

@@ -25,7 +25,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicExportLgrFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicExportLgrUi.h
     ${CMAKE_CURRENT_LIST_DIR}/RicEclipseCellResultToFileImpl.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicLgrSplitType.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicLgrSplitType.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicCellRangeUi.cpp
@@ -53,7 +54,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicExportWellPathsUi.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicExportLgrFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicExportLgrUi.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicEclipseCellResultToFileImpl.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicEclipseCellResultToFileImpl.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -62,4 +64,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\Export"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/FlowCommands/CMakeLists_files.cmake

@@ -9,7 +9,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicPlotProductionRateFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicSelectViewUI.h
     ${CMAKE_CURRENT_LIST_DIR}/RicShowTotalAllocationDataFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicShowCumulativePhasePlotFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicShowCumulativePhasePlotFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicAddStoredFlowCharacteristicsPlotFeature.cpp
@@ -22,7 +23,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicPlotProductionRateFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicSelectViewUI.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicShowTotalAllocationDataFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicShowCumulativePhasePlotFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicShowCumulativePhasePlotFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -31,4 +33,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\FlowDiagnostics"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/FractureCommands/CMakeLists_files.cmake

@@ -19,7 +19,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicCreateMultipleFracturesOptionItemUi.h
     ${CMAKE_CURRENT_LIST_DIR}/RicCreateMultipleFracturesUi.h
     ${CMAKE_CURRENT_LIST_DIR}/RicNewOptionItemFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicDeleteOptionItemFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicDeleteOptionItemFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicPasteEllipseFractureFeature.cpp
@@ -42,16 +43,19 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicCreateMultipleFracturesOptionItemUi.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicCreateMultipleFracturesUi.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicNewOptionItemFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicDeleteOptionItemFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicDeleteOptionItemFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
 list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 
 list(APPEND COMMAND_QT_MOC_HEADERS
-     ${CMAKE_CURRENT_LIST_DIR}/RicCreateMultipleFracturesFeature.h)
+     ${CMAKE_CURRENT_LIST_DIR}/RicCreateMultipleFracturesFeature.h
+)
 
 source_group(
   "CommandFeature\\Fracture"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/GeoMechCommands/CMakeLists_files.cmake

@@ -13,7 +13,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicRunAdvFaultReactAssessmentFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicRunBasicFaultReactAssessment3dFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicRunAdvFaultReactAssessment3dFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicRunFaultReactAssessmentFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicRunFaultReactAssessmentFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicGeoMechCopyCaseFeature.cpp
@@ -30,7 +31,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicRunAdvFaultReactAssessment3dFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicRunBasicFaultReactAssessmentFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicRunBasicFaultReactAssessment3dFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicRunFaultReactAssessmentFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicRunFaultReactAssessmentFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -42,4 +44,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\GeoMechCommands"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/GridCrossPlotCommands/CMakeLists_files.cmake

@@ -4,7 +4,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicSwapGridCrossPlotDataSetAxesFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicPasteGridCrossPlotDataSetFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicCreateSaturationPressurePlotsFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicSaturationPressureUi.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicSaturationPressureUi.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicCreateGridCrossPlotFeature.cpp
@@ -12,7 +13,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicSwapGridCrossPlotDataSetAxesFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicPasteGridCrossPlotDataSetFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicCreateSaturationPressurePlotsFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicSaturationPressureUi.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicSaturationPressureUi.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -21,4 +23,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\GridCrossPlot"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/HoloLensCommands/CMakeLists_files.cmake

@@ -19,7 +19,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/VdeExportPart.h
     ${CMAKE_CURRENT_LIST_DIR}/VdeFileExporter.h
     ${CMAKE_CURRENT_LIST_DIR}/VdePacketDirectory.h
-    ${CMAKE_CURRENT_LIST_DIR}/VdeVizDataExtractor.h)
+    ${CMAKE_CURRENT_LIST_DIR}/VdeVizDataExtractor.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicHoloLensExportToFolderFeature.cpp
@@ -41,7 +42,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/VdeExportPart.cpp
     ${CMAKE_CURRENT_LIST_DIR}/VdeFileExporter.cpp
     ${CMAKE_CURRENT_LIST_DIR}/VdePacketDirectory.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/VdeVizDataExtractor.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/VdeVizDataExtractor.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -49,9 +51,11 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 
 set(COMMAND_QT_MOC_HEADERS
     ${COMMAND_QT_MOC_HEADERS} ${CMAKE_CURRENT_LIST_DIR}/RicHoloLensRestClient.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicExportToSharingServerScheduler.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicExportToSharingServerScheduler.h
+)
 
 source_group(
   "CommandFeature\\HoloLens"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/IntersectionBoxCommands/CMakeLists_files.cmake

@@ -5,7 +5,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxXSliceFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxYSliceFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxZSliceFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxAtPosFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxAtPosFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicIntersectionFeatureImpl.cpp
@@ -14,7 +15,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxXSliceFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxYSliceFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxZSliceFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxAtPosFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxAtPosFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -22,9 +24,11 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 
 set(COMMAND_QT_MOC_HEADERS
     ${COMMAND_QT_MOC_HEADERS}
-    ${CMAKE_CURRENT_LIST_DIR}/RicBoxManipulatorEventHandler.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicBoxManipulatorEventHandler.h
+)
 
 source_group(
   "CommandFeature\\IntersectionBox"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/IntersectionViewCommands/CMakeLists_files.cmake

@@ -1,8 +1,10 @@
 set(SOURCE_GROUP_HEADER_FILES
-    ${CMAKE_CURRENT_LIST_DIR}/RicNewIntersectionViewFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewIntersectionViewFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
-    ${CMAKE_CURRENT_LIST_DIR}/RicNewIntersectionViewFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewIntersectionViewFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -11,4 +13,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\IntersectionView"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/MeasurementCommands/CMakeLists_files.cmake

@@ -1,10 +1,12 @@
 set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicToggleMeasurementModeFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicMeasurementPickEventHandler.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicMeasurementPickEventHandler.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicToggleMeasurementModeFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicMeasurementPickEventHandler.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicMeasurementPickEventHandler.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -15,4 +17,5 @@ list(APPEND COMMAND_QT_MOC_HEADERS)
 source_group(
   "CommandFeature\\Measurement"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/OctaveScriptCommands/CMakeLists_files.cmake

@@ -8,7 +8,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewOctaveScriptFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicNewPythonScriptFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicScriptFeatureImpl.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicRefreshScriptsFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicRefreshScriptsFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicAddScriptPathFeature.cpp
@@ -20,11 +21,13 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewOctaveScriptFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicNewPythonScriptFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicScriptFeatureImpl.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicRefreshScriptsFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicRefreshScriptsFeature.cpp
+)
 
 set(COMMAND_QT_MOC_HEADERS
     ${COMMAND_QT_MOC_HEADERS}
-    ${CMAKE_CURRENT_LIST_DIR}/RicExecuteScriptForCasesFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicExecuteScriptForCasesFeature.h
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -33,4 +36,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\Script"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/OperationsUsingObjReferences/CMakeLists_files.cmake

@@ -5,7 +5,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicPasteEclipseCasesFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicPasteEclipseViewsFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicPasteGeoMechViewsFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicPasteIntersectionsFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicPasteIntersectionsFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicCopyReferencesToClipboardFeature.cpp
@@ -14,7 +15,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicPasteEclipseCasesFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicPasteEclipseViewsFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicPasteGeoMechViewsFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicPasteIntersectionsFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicPasteIntersectionsFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -23,4 +25,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\ObjReferences"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/PlotTemplateCommands/CMakeLists_files.cmake

@@ -5,7 +5,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotTemplateTools.h
     ${CMAKE_CURRENT_LIST_DIR}/RicReloadPlotTemplatesFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicCreatePlotFromTemplateFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicCreatePlotFromTemplateByShortcutFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicCreatePlotFromTemplateByShortcutFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicSavePlotTemplateFeature.cpp
@@ -14,7 +15,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotTemplateTools.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicReloadPlotTemplatesFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicCreatePlotFromTemplateFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicCreatePlotFromTemplateByShortcutFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicCreatePlotFromTemplateByShortcutFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -25,4 +27,5 @@ list(APPEND COMMAND_QT_MOC_HEADERS)
 source_group(
   "CommandFeature\\PlotTemplate"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/SsiHubImportCommands/CMakeLists_files.cmake

@@ -4,7 +4,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimOilRegionEntry.h
     ${CMAKE_CURRENT_LIST_DIR}/RimWellPathImport.h
     ${CMAKE_CURRENT_LIST_DIR}/RimWellsEntry.h
-    ${CMAKE_CURRENT_LIST_DIR}/RiuWellImportWizard.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RiuWellImportWizard.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicWellPathsImportSsihubFeature.cpp
@@ -12,16 +13,19 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimOilRegionEntry.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimWellPathImport.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimWellsEntry.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RiuWellImportWizard.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RiuWellImportWizard.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
 list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 
 list(APPEND COMMAND_QT_MOC_HEADERS
-     ${CMAKE_CURRENT_LIST_DIR}/RiuWellImportWizard.h)
+     ${CMAKE_CURRENT_LIST_DIR}/RiuWellImportWizard.h
+)
 
 source_group(
   "CommandFeature\\SsiHub"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/StreamlineCommands/CMakeLists_files.cmake

@@ -1,8 +1,10 @@
 set(SOURCE_GROUP_HEADER_FILES
-    ${CMAKE_CURRENT_LIST_DIR}/RicNewStreamlineFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewStreamlineFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
-    ${CMAKE_CURRENT_LIST_DIR}/RicNewStreamlineFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewStreamlineFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -11,4 +13,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\StreamlineCommands"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake

@@ -42,7 +42,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicClearSourceSteppingEnsembleCurveSetFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicSetSourceSteppingEnsembleCurveSetFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicActivateCurveFilterInToolbarFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicNewDerivedSummaryFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewDerivedSummaryFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryPlotFeature.cpp
@@ -88,7 +89,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicClearSourceSteppingEnsembleCurveSetFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicSetSourceSteppingEnsembleCurveSetFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicActivateCurveFilterInToolbarFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicNewDerivedSummaryFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewDerivedSummaryFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -100,9 +102,11 @@ list(
   ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorWidgetCreator.h
   ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.h
   ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorWidgetCreator.h
-  ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.h)
+  ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.h
+)
 
 source_group(
   "CommandFeature\\SummaryPlot"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/SurfaceCommands/CMakeLists_files.cmake

@@ -5,7 +5,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewGridCaseSurfaceFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicExportKLayerToPtlFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicExportSurfaceToTsurfFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicNewSurfaceCollectionFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewSurfaceCollectionFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicImportSurfacesFeature.cpp
@@ -14,7 +15,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicNewGridCaseSurfaceFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicExportKLayerToPtlFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicExportSurfaceToTsurfFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicNewSurfaceCollectionFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewSurfaceCollectionFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -26,4 +28,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\SurfaceCommands"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/ToggleCommands/CMakeLists_files.cmake

@@ -5,7 +5,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicToggleItemsFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicToggleItemsOnOthersOffFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicCollapseSiblingsFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicMoveItemsToTopFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicMoveItemsToTopFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicToggleItemsFeatureImpl.cpp
@@ -14,7 +15,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicToggleItemsFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicToggleItemsOnOthersOffFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicCollapseSiblingsFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicMoveItemsToTopFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicMoveItemsToTopFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -23,4 +25,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\ToggleItems"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/ViewLink/CMakeLists_files.cmake

@@ -8,7 +8,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicDeleteAllLinkedViewsFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicSetMasterViewFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicRemoveComparison3dViewFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicCompareTo3dViewFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicCompareTo3dViewFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicLinkVisibleViewsFeature.cpp
@@ -20,7 +21,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicDeleteAllLinkedViewsFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicSetMasterViewFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicRemoveComparison3dViewFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicCompareTo3dViewFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicCompareTo3dViewFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -29,4 +31,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\ViewLink"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/WellLogCommands/CMakeLists_files.cmake

@@ -26,7 +26,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/Ric3dWellLogCurvePickEventHandler.h
     ${CMAKE_CURRENT_LIST_DIR}/RicNewWellBoreStabilityPlotFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicNewWellMeasurementCurveFeature.h
-    ${CMAKE_CURRENT_LIST_DIR}/RicNewEnsembleWellLogCurveSetFeature.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewEnsembleWellLogCurveSetFeature.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicAddWellLogToPlotFeature.cpp
@@ -56,7 +57,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/Ric3dWellLogCurvePickEventHandler.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicNewWellBoreStabilityPlotFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicNewWellMeasurementCurveFeature.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RicNewEnsembleWellLogCurveSetFeature.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewEnsembleWellLogCurveSetFeature.cpp
+)
 
 list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -65,4 +67,5 @@ list(APPEND COMMAND_CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "CommandFeature\\WellLog"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/Commands/WellPathCommands/CMakeLists_files.cmake

@@ -78,9 +78,11 @@ list(
   ${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicWellPathGeometry3dEditor.h
   ${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicPolyline3dEditor.h
   ${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicPolylineTarget3dEditor.h
-  ${CMAKE_CURRENT_LIST_DIR}/RicCreateMultipleWellPathLaterals.h)
+  ${CMAKE_CURRENT_LIST_DIR}/RicCreateMultipleWellPathLaterals.h
+)
 
 source_group(
   "CommandFeature\\WellPath"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/FileInterface/CMakeLists_files.cmake

@@ -147,4 +147,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "FileInterface"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/GeoMech/GeoMechDataModel/CMakeLists.txt

@@ -104,12 +104,14 @@ add_library(
   RigFemPartResultCalculatorShearSlipIndicator.h
   RigFemPartResultCalculatorShearSlipIndicator.cpp
   RimGeoMechGeometrySelectionItem.h
-  RimGeoMechGeometrySelectionItem.cpp)
+  RimGeoMechGeometrySelectionItem.cpp
+)
 
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 set(LINK_LIBRARIES LibCore cafPdmCvf cafTensor cafUserInterface CommonCode
-                   ResultStatisticsCache)
+                   ResultStatisticsCache
+)
 
 target_link_libraries(${PROJECT_NAME} ${LINK_LIBRARIES})
 

ApplicationLibCode/GeoMech/GeoMechVisualization/CMakeLists_files.cmake

@@ -5,7 +5,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RivGeoMechPartMgrCache.h
     ${CMAKE_CURRENT_LIST_DIR}/RivGeoMechVizLogic.h
     ${CMAKE_CURRENT_LIST_DIR}/RivFemPickSourceInfo.h
-    ${CMAKE_CURRENT_LIST_DIR}/RivFemElmVisibilityCalculator.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RivFemElmVisibilityCalculator.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RivFemPartGeometryGenerator.cpp
@@ -14,7 +15,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RivGeoMechPartMgrCache.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RivGeoMechVizLogic.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RivFemPickSourceInfo.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RivFemElmVisibilityCalculator.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RivFemElmVisibilityCalculator.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -22,4 +24,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 
 source_group(
   "GeoMechViz" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-                     ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+                     ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/GeoMech/OdbReader/CMakeLists.txt

@@ -44,7 +44,8 @@ include_directories(${RESINSIGHT_ODB_API_DIR}/include)
 
 add_library(
   ${PROJECT_NAME} RifOdbReader.h RifOdbReader.cpp RifGeoMechReaderInterface.h
-                  RifGeoMechReaderInterface.cpp OdbSetup.cmake)
+                  RifGeoMechReaderInterface.cpp OdbSetup.cmake
+)
 
 if(MSVC)
   list(
@@ -61,7 +62,8 @@ if(MSVC)
     ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbCoreGeom.lib
     ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbDdbOdb.lib
     ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMARomDiagEx.lib
-    ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMASimInterface.lib)
+    ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMASimInterface.lib
+  )
 else()
   list(
     APPEND
@@ -77,12 +79,14 @@ else()
     ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMABasAlloc.so
     ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAAbuGeom.so
     ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMARomDiagEx.so
-    ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMASimInterface.so)
+    ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMASimInterface.so
+  )
 endif(MSVC)
 
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
-target_link_libraries(${PROJECT_NAME} ${RI_ODB_LIBS} RigGeoMechDataModel
+target_link_libraries(
-                      LibCore)
+  ${PROJECT_NAME} ${RI_ODB_LIBS} RigGeoMechDataModel LibCore
+)
 
 source_group("" FILES ${PROJECT_FILES})

ApplicationLibCode/GeoMech/OdbReader_UnitTests/CMakeLists.txt

@@ -4,13 +4,16 @@ project(OdbReader_UnitTests)
 
 set(RI_VIZ_FWK_ROOT
     ../../../Fwk/VizFwk
-    CACHE PATH "Path to VizFwk")
+    CACHE PATH "Path to VizFwk"
+)
 set(RI_GTEST_ROOT
     ../../../ThirdParty
-    CACHE PATH "Path to folder containing gtest folder")
+    CACHE PATH "Path to folder containing gtest folder"
+)
 set(RI_TEST_FILE
     ""
-    CACHE FILEPATH "Path to test file")
+    CACHE FILEPATH "Path to test file"
+)
 
 include(${RI_VIZ_FWK_ROOT}/CMake/Utils/ceeDetermineCompilerFlags.cmake)
 
@@ -29,7 +32,8 @@ include_directories(../GeoMechDataModel)
 include_directories(${RI_GTEST_ROOT})
 
 set(UNIT_TEST_CPP_SOURCES main.cpp RifOdbReader-Test.cpp
-                          ${RI_GTEST_ROOT}/gtest/gtest-all.cc)
+                          ${RI_GTEST_ROOT}/gtest/gtest-all.cc
+)
 
 add_executable(${PROJECT_NAME} ${UNIT_TEST_CPP_SOURCES})
 target_link_libraries(${PROJECT_NAME} RifOdbReader)

ApplicationLibCode/ModelVisualization/CMakeLists_files.cmake

@@ -58,7 +58,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RivElementVectorResultPartMgr.h
     ${CMAKE_CURRENT_LIST_DIR}/RivPolylinePartMgr.h
     ${CMAKE_CURRENT_LIST_DIR}/RivCellFilterPartMgr.h
-    ${CMAKE_CURRENT_LIST_DIR}/RivDrawableSpheres.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RivDrawableSpheres.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RivCellEdgeEffectGenerator.cpp
@@ -115,7 +116,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RivElementVectorResultPartMgr.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RivPolylinePartMgr.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RivCellFilterPartMgr.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RivDrawableSpheres.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RivDrawableSpheres.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -124,4 +126,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ModelVisualization"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ModelVisualization/GridBox/CMakeLists_files.cmake

@@ -1,8 +1,10 @@
 set(SOURCE_GROUP_HEADER_FILES ${CMAKE_CURRENT_LIST_DIR}/RivPatchGenerator.h
-                              ${CMAKE_CURRENT_LIST_DIR}/RivGridBoxGenerator.h)
+                              ${CMAKE_CURRENT_LIST_DIR}/RivGridBoxGenerator.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES ${CMAKE_CURRENT_LIST_DIR}/RivPatchGenerator.cpp
-                              ${CMAKE_CURRENT_LIST_DIR}/RivGridBoxGenerator.cpp)
+                              ${CMAKE_CURRENT_LIST_DIR}/RivGridBoxGenerator.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -11,4 +13,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ModelVisualization\\GridBox"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ModelVisualization/Intersections/CMakeLists_files.cmake

@@ -7,7 +7,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RivBoxIntersectionGeometryGenerator.h
     ${CMAKE_CURRENT_LIST_DIR}/RivBoxIntersectionPartMgr.h
     ${CMAKE_CURRENT_LIST_DIR}/RivBoxIntersectionSourceInfo.h
-    ${CMAKE_CURRENT_LIST_DIR}/RivSectionFlattener.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RivSectionFlattener.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionGeometryGenerator.cpp
@@ -18,7 +19,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RivBoxIntersectionGeometryGenerator.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RivBoxIntersectionPartMgr.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RivBoxIntersectionSourceInfo.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RivSectionFlattener.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RivSectionFlattener.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -27,4 +29,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ModelVisualization\\Intersections"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ModelVisualization/Streamlines/CMakeLists_files.cmake

@@ -1,7 +1,8 @@
 set(SOURCE_GROUP_HEADER_FILES ${CMAKE_CURRENT_LIST_DIR}/RivStreamlinesPartMgr.h)
 
 set(SOURCE_GROUP_SOURCE_FILES
-    ${CMAKE_CURRENT_LIST_DIR}/RivStreamlinesPartMgr.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RivStreamlinesPartMgr.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -10,4 +11,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ModelVisualization\\Streamlines"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ModelVisualization/Surfaces/CMakeLists_files.cmake

@@ -1,12 +1,14 @@
 set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RivSurfacePartMgr.h
     ${CMAKE_CURRENT_LIST_DIR}/RivSurfaceIntersectionGeometryGenerator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RivReservoirSurfaceIntersectionSourceInfo.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RivReservoirSurfaceIntersectionSourceInfo.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RivSurfacePartMgr.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RivSurfaceIntersectionGeometryGenerator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RivReservoirSurfaceIntersectionSourceInfo.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RivReservoirSurfaceIntersectionSourceInfo.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -15,4 +17,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ModelVisualization\\Surfaces"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ModelVisualization/WindowEdgeAxesOverlayItem/CMakeLists_files.cmake

@@ -1,8 +1,10 @@
 set(SOURCE_GROUP_HEADER_FILES
-    ${CMAKE_CURRENT_LIST_DIR}/RivWindowEdgeAxesOverlayItem.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RivWindowEdgeAxesOverlayItem.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
-    ${CMAKE_CURRENT_LIST_DIR}/RivWindowEdgeAxesOverlayItem.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RivWindowEdgeAxesOverlayItem.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -11,4 +13,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ModelVisualization\\WindowEdgeAxesOverlayItem"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/AnalysisPlots/CMakeLists_files.cmake

@@ -3,14 +3,16 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimAnalysisPlotDataEntry.h
     ${CMAKE_CURRENT_LIST_DIR}/RimAnalysisPlotCollection.h
     ${CMAKE_CURRENT_LIST_DIR}/RimPlotDataFilterCollection.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimPlotDataFilterItem.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimPlotDataFilterItem.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimAnalysisPlot.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimAnalysisPlotDataEntry.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimAnalysisPlotCollection.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimPlotDataFilterCollection.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimPlotDataFilterItem.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimPlotDataFilterItem.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -21,4 +23,5 @@ list(APPEND QT_MOC_HEADERS)
 source_group(
   "ProjectDataModel\\AnalysisPlots"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/Annotations/CMakeLists_files.cmake

@@ -15,7 +15,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimReachCircleAnnotationInView.h
     ${CMAKE_CURRENT_LIST_DIR}/RimTextAnnotationInView.h
     ${CMAKE_CURRENT_LIST_DIR}/RimAnnotationGroupCollection.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimPolylineTarget.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimPolylineTarget.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimAnnotationCollectionBase.cpp
@@ -34,7 +35,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimReachCircleAnnotationInView.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimTextAnnotationInView.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimAnnotationGroupCollection.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimPolylineTarget.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimPolylineTarget.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -45,4 +47,5 @@ set(QT_MOC_HEADERS ${QT_MOC_HEADERS})
 source_group(
   "ProjectDataModel\\Annotations"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/CMakeLists_files.cmake

@@ -118,7 +118,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimPolylinesDataInterface.h
     ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleCurveSetInterface.h
     ${CMAKE_CURRENT_LIST_DIR}/cafTreeNode.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimMultipleLocations.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimMultipleLocations.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimEclipseCaseCollection.cpp
@@ -235,7 +236,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimEquilibriumAxisAnnotation.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimTimeAxisAnnotation.cpp
     ${CMAKE_CURRENT_LIST_DIR}/cafTreeNode.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimMultipleLocations.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimMultipleLocations.cpp
+)
 
 if(Qt5Charts_FOUND)
   list(
@@ -245,7 +247,8 @@ if(Qt5Charts_FOUND)
     ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleFractureStatisticsPlot.h
     ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleFractureStatisticsPlotCollection.h
     ${CMAKE_CURRENT_LIST_DIR}/RimGridStatisticsPlotCollection.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimGridStatisticsPlot.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimGridStatisticsPlot.h
+  )
 
   list(
     APPEND
@@ -254,7 +257,8 @@ if(Qt5Charts_FOUND)
     ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleFractureStatisticsPlot.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleFractureStatisticsPlotCollection.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimGridStatisticsPlotCollection.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimGridStatisticsPlot.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimGridStatisticsPlot.cpp
+  )
 endif()
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
@@ -266,4 +270,5 @@ list(APPEND QT_MOC_HEADERS ${CMAKE_CURRENT_LIST_DIR}/RimPlot.h)
 source_group(
   "ProjectDataModel"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/CellFilters/CMakeLists_files.cmake

@@ -10,7 +10,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechPropertyFilterCollection.h
     ${CMAKE_CURRENT_LIST_DIR}/RimPolygonFilter.h
     ${CMAKE_CURRENT_LIST_DIR}/RimUserDefinedFilter.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimCellFilterIntervalTool.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimCellFilterIntervalTool.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimCellFilter.cpp
@@ -24,7 +25,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechPropertyFilterCollection.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimPolygonFilter.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimUserDefinedFilter.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimCellFilterIntervalTool.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimCellFilterIntervalTool.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -33,4 +35,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ProjectDataModel\\CellFilters"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/Completions/CMakeLists_files.cmake

@@ -32,7 +32,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimMultipleValveLocations.h
     ${CMAKE_CURRENT_LIST_DIR}/RimWellPathAicdParameters.h
     ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleFractureStatistics.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleFractureStatisticsCollection.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleFractureStatisticsCollection.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimCompletionCellIntersectionCalc.cpp
@@ -65,7 +66,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimMultipleValveLocations.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimWellPathAicdParameters.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleFractureStatistics.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleFractureStatisticsCollection.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleFractureStatisticsCollection.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -74,4 +76,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ProjectDataModel\\Completions"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/CorrelationPlots/CMakeLists_files.cmake

@@ -4,7 +4,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimCorrelationMatrixPlot.h
     ${CMAKE_CURRENT_LIST_DIR}/RimParameterResultCrossPlot.h
     ${CMAKE_CURRENT_LIST_DIR}/RimCorrelationPlotCollection.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimCorrelationReportPlot.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimCorrelationReportPlot.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimAbstractCorrelationPlot.cpp
@@ -12,7 +13,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimCorrelationMatrixPlot.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimParameterResultCrossPlot.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimCorrelationPlotCollection.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimCorrelationReportPlot.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimCorrelationReportPlot.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -21,4 +23,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ProjectDataModel\\CorrelationPlots"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/Faults/CMakeLists_files.cmake

@@ -3,14 +3,16 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimFaultInViewCollection.h
     ${CMAKE_CURRENT_LIST_DIR}/RimFaultRASettings.h
     ${CMAKE_CURRENT_LIST_DIR}/RimFaultRAPreprocSettings.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimFaultRAPostprocSettings.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimFaultRAPostprocSettings.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimFaultInView.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimFaultInViewCollection.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimFaultRASettings.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimFaultRAPreprocSettings.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimFaultRAPostprocSettings.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimFaultRAPostprocSettings.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -19,4 +21,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ProjectDataModel\\Faults"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/Flow/CMakeLists_files.cmake

@@ -13,7 +13,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimWellPlotTools.h
     ${CMAKE_CURRENT_LIST_DIR}/RimWellRftEnsembleCurveSet.h
     ${CMAKE_CURRENT_LIST_DIR}/RimWellDistributionPlot.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimWellDistributionPlotCollection.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimWellDistributionPlotCollection.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimFlowDiagSolution.cpp
@@ -30,7 +31,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimWellPlotTools.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimWellRftEnsembleCurveSet.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimWellDistributionPlot.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimWellDistributionPlotCollection.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimWellDistributionPlotCollection.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -39,4 +41,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ProjectDataModel\\Flow"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/GeoMech/CMakeLists_files.cmake

@@ -6,7 +6,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCellColors.h
     ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapProjection.h
     ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapView.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapViewCollection.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapViewCollection.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechModels.cpp
@@ -16,7 +17,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCellColors.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapProjection.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapView.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapViewCollection.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimGeoMechContourMapViewCollection.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -25,4 +27,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ProjectDataModel\\GeoMech"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/GridCrossPlots/CMakeLists_files.cmake

@@ -4,7 +4,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimGridCrossPlotCurve.h
     ${CMAKE_CURRENT_LIST_DIR}/RimGridCrossPlotDataSet.h
     ${CMAKE_CURRENT_LIST_DIR}/RimSaturationPressurePlot.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimSaturationPressurePlotCollection.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimSaturationPressurePlotCollection.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimGridCrossPlot.cpp
@@ -12,7 +13,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimGridCrossPlotCurve.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimGridCrossPlotDataSet.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimSaturationPressurePlot.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimSaturationPressurePlotCollection.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimSaturationPressurePlotCollection.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -23,4 +25,5 @@ list(APPEND QT_MOC_HEADERS ${CMAKE_CURRENT_LIST_DIR}/RimGridCrossPlot.h)
 source_group(
   "ProjectDataModel\\GridCrossPlots"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/GridCrossPlots/CellFilters/CMakeLists_files.cmake

@@ -1,12 +1,14 @@
 set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimPlotCellFilter.h
     ${CMAKE_CURRENT_LIST_DIR}/RimPlotCellFilterCollection.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimPlotCellPropertyFilter.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimPlotCellPropertyFilter.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimPlotCellFilter.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimPlotCellFilterCollection.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimPlotCellPropertyFilter.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimPlotCellPropertyFilter.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -15,4 +17,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ProjectDataModel\\GridCrossPlots\\CellFilters"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/Measurement/CMakeLists_files.cmake

@@ -1,19 +1,23 @@
 set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimMeasurement.h
-    ${CMAKE_CURRENT_LIST_DIR}/RiuMeasurementEventFilter.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RiuMeasurementEventFilter.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimMeasurement.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RiuMeasurementEventFilter.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RiuMeasurementEventFilter.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
 list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 
 set(QT_MOC_HEADERS ${CMAKE_CURRENT_LIST_DIR}/RiuMeasurementEventFilter.h
-                   ${QT_MOC_HEADERS})
+                   ${QT_MOC_HEADERS}
+)
 
 source_group(
   "ProjectDataModel\\Measurement"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/Parameters/CMakeLists_files.cmake

@@ -3,14 +3,16 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimDoubleParameter.h
     ${CMAKE_CURRENT_LIST_DIR}/RimIntegerParameter.h
     ${CMAKE_CURRENT_LIST_DIR}/RimStringParameter.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimParameterGroup.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimParameterGroup.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimGenericParameter.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimDoubleParameter.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimIntegerParameter.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimStringParameter.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimParameterGroup.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimParameterGroup.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -19,4 +21,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ProjectDataModel\\Parameters"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/PlotTemplates/CMakeLists_files.cmake

@@ -1,10 +1,12 @@
 set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimPlotTemplateFolderItem.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimPlotTemplateFileItem.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimPlotTemplateFileItem.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimPlotTemplateFolderItem.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimPlotTemplateFileItem.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimPlotTemplateFileItem.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -13,4 +15,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ProjectDataModel\\PlotTemplates"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/ProcessControl/CMakeLists_files.cmake

@@ -1,17 +1,21 @@
 set(SOURCE_GROUP_HEADER_FILES ${CMAKE_CURRENT_LIST_DIR}/RimProcess.h
-                              ${CMAKE_CURRENT_LIST_DIR}/RimProcessMonitor.h)
+                              ${CMAKE_CURRENT_LIST_DIR}/RimProcessMonitor.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES ${CMAKE_CURRENT_LIST_DIR}/RimProcess.cpp
-                              ${CMAKE_CURRENT_LIST_DIR}/RimProcessMonitor.cpp)
+                              ${CMAKE_CURRENT_LIST_DIR}/RimProcessMonitor.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
 list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 
 list(APPEND COMMAND_QT_MOC_HEADERS
-     ${CMAKE_CURRENT_LIST_DIR}/RimProcessMonitor.h)
+     ${CMAKE_CURRENT_LIST_DIR}/RimProcessMonitor.h
+)
 
 source_group(
   "ProjectDataModel\\ProcessControl"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/StimPlanModel/CMakeLists_files.cmake

@@ -22,7 +22,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimFaciesInitialPressureConfig.h
     ${CMAKE_CURRENT_LIST_DIR}/RimPressureTableItem.h
     ${CMAKE_CURRENT_LIST_DIR}/RimPressureTable.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimExtractionConfiguration.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimExtractionConfiguration.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimStimPlanModelCollection.cpp
@@ -46,7 +47,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimFaciesInitialPressureConfig.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimPressureTableItem.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimPressureTable.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimExtractionConfiguration.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimExtractionConfiguration.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -57,4 +59,5 @@ list(APPEND QT_MOC_HEADERS)
 source_group(
   "ProjectDataModel\\StimPlanModel"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/Streamlines/CMakeLists_files.cmake

@@ -3,14 +3,16 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimStreamlineInViewCollection.h
     ${CMAKE_CURRENT_LIST_DIR}/RimStreamlineGeneratorBase.h
     ${CMAKE_CURRENT_LIST_DIR}/RimStreamlineDataAccess.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimStreamlineGenerator.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimStreamlineGenerator.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimStreamline.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimStreamlineInViewCollection.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimStreamlineGeneratorBase.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimStreamlineDataAccess.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimStreamlineGenerator.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimStreamlineGenerator.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -19,4 +21,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ProjectDataModel\\Streamlines"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/Summary/CMakeLists_files.cmake

@@ -37,7 +37,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimDerivedEnsembleCaseCollection.h
     ${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotFilterTextCurveSetEditor.h
     ${CMAKE_CURRENT_LIST_DIR}/RimObjectiveFunction.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimObjectiveFunctionTools.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimObjectiveFunctionTools.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimAsciiDataCurve.cpp
@@ -78,7 +79,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimDerivedEnsembleCaseCollection.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotFilterTextCurveSetEditor.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimObjectiveFunction.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimObjectiveFunctionTools.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimObjectiveFunctionTools.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -89,4 +91,5 @@ list(APPEND QT_MOC_HEADERS ${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlot.h)
 source_group(
   "ProjectDataModel\\Summary"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/Surfaces/CMakeLists_files.cmake

@@ -8,7 +8,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimSurfaceResultDefinition.h
     ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleSurface.h
     ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleSurfaceInView.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleStatisticsSurface.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleStatisticsSurface.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimSurface.cpp
@@ -20,7 +21,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimSurfaceResultDefinition.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleSurface.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleSurfaceInView.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleStatisticsSurface.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleStatisticsSurface.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -29,4 +31,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ProjectDataModel\\Surface"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/WellLog/CMakeLists_files.cmake

@@ -22,7 +22,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimWellLogFileChannel.h
     ${CMAKE_CURRENT_LIST_DIR}/RimWellLogFileCurve.h
     ${CMAKE_CURRENT_LIST_DIR}/RimWellLogRftCurve.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimWellLogWbsCurve.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimWellLogWbsCurve.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimWellLogPlotCollection.cpp
@@ -48,7 +49,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleWellLogsCollection.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleWellLogCurveSet.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleWellLogStatistics.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleWellLogStatisticsCurve.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimEnsembleWellLogStatisticsCurve.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -57,4 +59,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ProjectDataModel\\WellLog"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/WellMeasurement/CMakeLists_files.cmake

@@ -5,7 +5,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimWellMeasurementCurve.h
     ${CMAKE_CURRENT_LIST_DIR}/RimWellMeasurementFilter.h
     ${CMAKE_CURRENT_LIST_DIR}/RimWellMeasurementInViewCollection.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimWellMeasurementInView.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimWellMeasurementInView.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimWellMeasurement.cpp
@@ -14,7 +15,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimWellMeasurementCurve.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimWellMeasurementFilter.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimWellMeasurementInViewCollection.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimWellMeasurementInView.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimWellMeasurementInView.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -23,4 +25,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ProjectDataModel\\WellMeasurement"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModel/WellPath/CMakeLists_files.cmake

@@ -9,7 +9,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimWellPathAttributeCollection.h
     ${CMAKE_CURRENT_LIST_DIR}/RimWellPathCollection.h
     ${CMAKE_CURRENT_LIST_DIR}/RimWellPathTarget.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimWellPathTieIn.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimWellPathTieIn.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimFileWellPath.cpp
@@ -22,7 +23,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimWellPathGeometryDefTools.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimWellPathGroup.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimWellPathTarget.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimWellPathTieIn.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimWellPathTieIn.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -31,4 +33,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ProjectDataModel\\WellPath"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModelCommands/CMakeLists_files.cmake

@@ -17,7 +17,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimcWellLogPlot.h
     ${CMAKE_CURRENT_LIST_DIR}/RimcWellLogTrack.h
     ${CMAKE_CURRENT_LIST_DIR}/RimcWellPathGeometryDef.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimcModeledWellPath.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RimcModeledWellPath.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimcSummaryPlotCollection.cpp
@@ -38,7 +39,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimcWellLogPlot.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimcWellLogTrack.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimcWellPathGeometryDef.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimcModeledWellPath.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RimcModeledWellPath.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -47,4 +49,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ProjectDataModelCommands"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ProjectDataModelCommands/CommandRouter/CMakeLists_files.cmake

@@ -1,8 +1,10 @@
 set(SOURCE_GROUP_HEADER_FILES ${CMAKE_CURRENT_LIST_DIR}/RimCommandRouter.h
-                              ${CMAKE_CURRENT_LIST_DIR}/RimcExtractSurfaces.h)
+                              ${CMAKE_CURRENT_LIST_DIR}/RimcExtractSurfaces.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES ${CMAKE_CURRENT_LIST_DIR}/RimCommandRouter.cpp
-                              ${CMAKE_CURRENT_LIST_DIR}/RimcExtractSurfaces.cpp)
+                              ${CMAKE_CURRENT_LIST_DIR}/RimcExtractSurfaces.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -11,4 +13,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ProjectDataModelCommands\\CommandRouter"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ReservoirDataModel/CMakeLists_files.cmake

@@ -90,7 +90,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RigEnsembleParameter.h
     ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceResampler.h
     ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceStatisticsCalculator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogIndexDepthOffset.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogIndexDepthOffset.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RigActiveCellInfo.cpp
@@ -177,7 +178,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RigEnsembleParameter.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceResampler.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceStatisticsCalculator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogIndexDepthOffset.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RigWellLogIndexDepthOffset.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -186,4 +188,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ReservoirDataModel"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ReservoirDataModel/CMakeLists_filesNotToUnitTest.cmake

@@ -5,7 +5,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseRangeFilterMapper.h
     ${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCenterLineCalculator.h
     ${CMAKE_CURRENT_LIST_DIR}/RigWellLogFile.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigReservoirGridTools.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RigReservoirGridTools.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RigGeoMechWellLogExtractor.cpp
@@ -14,7 +15,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseRangeFilterMapper.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCenterLineCalculator.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigWellLogFile.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigReservoirGridTools.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RigReservoirGridTools.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -23,4 +25,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ReservoirDataModel2"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_filesNotToUnitTest.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_filesNotToUnitTest.cmake
+)

ApplicationLibCode/ReservoirDataModel/Completions/CMakeLists_files.cmake

@@ -7,7 +7,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RigWellPathStimplanIntersector.h
     ${CMAKE_CURRENT_LIST_DIR}/RigVirtualPerforationTransmissibilities.h
     ${CMAKE_CURRENT_LIST_DIR}/RigEclipseToStimPlanCalculator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigPerforationTransmissibilityEquations.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RigPerforationTransmissibilityEquations.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RigCompletionData.cpp
@@ -18,7 +19,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RigWellPathStimplanIntersector.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigVirtualPerforationTransmissibilities.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigEclipseToStimPlanCalculator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigPerforationTransmissibilityEquations.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RigPerforationTransmissibilityEquations.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -27,4 +29,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 source_group(
   "ReservoirDataModel\\Completions"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/ResultStatisticsCache/CMakeLists.txt

@@ -8,7 +8,8 @@ add_library(
   ${PROJECT_NAME}
   RigStatisticsCalculator.h RigStatisticsCalculator.cpp
   RigStatisticsDataCache.h RigStatisticsDataCache.cpp RigStatisticsMath.h
-  RigStatisticsMath.cpp)
+  RigStatisticsMath.cpp
+)
 
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 

ApplicationLibCode/UnitTests/CMakeLists_files.cmake

@@ -1,5 +1,7 @@
-configure_file(${CMAKE_CURRENT_LIST_DIR}/RiaTestDataDirectory.h.cmake
+configure_file(
-               ${CMAKE_BINARY_DIR}/Generated/RiaTestDataDirectory.h)
+  ${CMAKE_CURRENT_LIST_DIR}/RiaTestDataDirectory.h.cmake
+  ${CMAKE_BINARY_DIR}/Generated/RiaTestDataDirectory.h
+)
 
 set(SOURCE_GROUP_HEADER_FILES)
 
@@ -76,11 +78,13 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RigSlice2D-Test.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceResampler-Test.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceStatisticsCalculator-Test.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/StructGridInterface-Test.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/StructGridInterface-Test.cpp
+)
 
 if(RESINSIGHT_ENABLE_GRPC)
   list(APPEND GPRC_UNIT_TEST_SOURCE_FILES
-       ${CMAKE_CURRENT_LIST_DIR}/RiaGrpcInterface-Test.cpp)
+       ${CMAKE_CURRENT_LIST_DIR}/RiaGrpcInterface-Test.cpp
+  )
   list(APPEND SOURCE_GROUP_SOURCE_FILES ${GRPC_UNIT_TEST_SOURCE_FILES})
 endif(RESINSIGHT_ENABLE_GRPC)
 
@@ -90,4 +94,5 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 
 source_group(
   "UnitTests" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-                    ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+                    ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/UserInterface/AnalysisPlots/CMakeLists_files.cmake

@@ -1,8 +1,10 @@
 set(SOURCE_GROUP_HEADER_FILES
-    ${CMAKE_CURRENT_LIST_DIR}/RiuGroupedBarChartBuilder.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RiuGroupedBarChartBuilder.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
-    ${CMAKE_CURRENT_LIST_DIR}/RiuGroupedBarChartBuilder.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RiuGroupedBarChartBuilder.cpp
+)
 
 list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
@@ -15,4 +17,5 @@ list(APPEND QT_UI_FILES)
 source_group(
   "UserInterface/AnalysisPlots"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

ApplicationLibCode/UserInterface/CMakeLists_files.cmake

@@ -92,7 +92,8 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiuScalarMapperLegendFrame.h
     ${CMAKE_CURRENT_LIST_DIR}/RiuFileDialogTools.h
     ${CMAKE_CURRENT_LIST_DIR}/RiuGuiTheme.h
-    ${CMAKE_CURRENT_LIST_DIR}/RiuQssSyntaxHighlighter.h)
+    ${CMAKE_CURRENT_LIST_DIR}/RiuQssSyntaxHighlighter.h
+)
 
 set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiuCadNavigation.cpp
@@ -186,7 +187,8 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiuGuiTheme.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiuQssSyntaxHighlighter.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiuTextEditWithCompletion.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RiuTextContentFrame.cpp)
+    ${CMAKE_CURRENT_LIST_DIR}/RiuTextContentFrame.cpp
+)
 
 if(Qt5Charts_FOUND)
   list(APPEND CODE_HEADER_FILES ${CMAKE_CURRENT_LIST_DIR}/RiuQtChartView.h)
@@ -246,11 +248,13 @@ list(
   ${CMAKE_CURRENT_LIST_DIR}/RiuCategoryLegendFrame.h
   ${CMAKE_CURRENT_LIST_DIR}/RiuScalarMapperLegendFrame.h
   ${CMAKE_CURRENT_LIST_DIR}/RiuTextEditWithCompletion.h
-  ${CMAKE_CURRENT_LIST_DIR}/RiuTextContentFrame.h)
+  ${CMAKE_CURRENT_LIST_DIR}/RiuTextContentFrame.h
+)
 
 list(APPEND QT_UI_FILES)
 
 source_group(
   "UserInterface"
   FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
-        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake)
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake
+)

CMakeLists.txt

@@ -14,7 +14,8 @@ if(UNIX)
   option(
     RESINSIGHT_PREFER_LEGACY_OPENGL
     "Link with Legacy OpenGL libraries. This may be necessary in some virtualization environments"
-    ON)
+    ON
+  )
   if(RESINSIGHT_PREFER_LEGACY_OPENGL)
     set(OpenGL_GL_PREFERENCE LEGACY)
   endif()
@@ -24,14 +25,16 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 set(BUILD_SHARED_LIBS
     OFF
-    CACHE BOOL "ERT: Build shared libraries")
+    CACHE BOOL "ERT: Build shared libraries"
+)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 option(RESINSIGHT_BUNDLE_TESTMODELS "Copy TestModels into the installation" OFF)
 
 option(VCPKG_AUTO_INSTALL
-       "Automatically download build pre-requisites with VCPKG" OFF)
+       "Automatically download build pre-requisites with VCPKG" OFF
+)
 if(VCPKG_AUTO_INSTALL)
   include(AutoVcpkg)
   set(AUTO_VCPKG_ROOT "${CMAKE_SOURCE_DIR}/ThirdParty/vcpkg")
@@ -73,7 +76,8 @@ if(RESINSIGHT_USE_OPENMP)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS} -DUSE_OPENMP")
     set(CMAKE_EXE_LINKER_FLAGS
-        "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
+        "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}"
+    )
   else()
     message(STATUS "Disabling OpenMP support")
   endif()
@@ -112,9 +116,11 @@ if(RESINSIGHT_ENABLE_GRPC)
   option(
     RESINSIGHT_GRPC_DOWNLOAD_PYTHON_MODULE
     "Download the gRPC python modules to enable generation of Python interface"
-    ON)
+    ON
+  )
   option(RESINSIGHT_GRPC_BUNDLE_PYTHON_MODULE
-         "Bundle the gRPC python modules into the install folder" OFF)
+         "Bundle the gRPC python modules into the install folder" OFF
+  )
   add_definitions(-DENABLE_GRPC)
 endif()
 
@@ -124,7 +130,8 @@ endif()
 
 # CMAKE_UNITY_BUILD was introduced in CMake 3.16.2
 option(RESINSIGHT_ENABLE_UNITY_BUILD
-       "Experimental speedup of compilation using CMake Unity Build" OFF)
+       "Experimental speedup of compilation using CMake Unity Build" OFF
+)
 mark_as_advanced(FORCE RESINSIGHT_ENABLE_UNITY_BUILD)
 if(RESINSIGHT_ENABLE_UNITY_BUILD)
   set(CAF_ENABLE_UNITY_BUILD true)
@@ -145,15 +152,18 @@ if(NOT MSVC)
   # libraries and includes
   set(RESINSIGHT_ERT_EXTERNAL_LIB_ROOT
       ""
-      CACHE PATH "Path to installed ERT libraries")
+      CACHE PATH "Path to installed ERT libraries"
+  )
   set(RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT
       ""
-      CACHE PATH "Path to installed ERT includes")
+      CACHE PATH "Path to installed ERT includes"
+  )
 endif()
 
 if(RESINSIGHT_ERT_EXTERNAL_LIB_ROOT OR RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT)
   if(NOT (RESINSIGHT_ERT_EXTERNAL_LIB_ROOT
-          AND RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT))
+          AND RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT)
+  )
     message(
       FATAL_ERROR
         "Both RESINSIGHT_ERT_EXTERNAL_LIB_ROOT and RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT must be defined"
@@ -162,7 +172,8 @@ if(RESINSIGHT_ERT_EXTERNAL_LIB_ROOT OR RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT)
 
   message(
     FATAL_ERROR
-      "TODO: Building using and external system installed ERT is broken.")
+      "TODO: Building using and external system installed ERT is broken."
+  )
 
   list(APPEND ERT_INCLUDE_DIRS ${RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT})
 
@@ -174,10 +185,12 @@ else()
   # directly
   set(INSTALL_ERT
       OFF
-      CACHE BOOL "ERT: Install library")
+      CACHE BOOL "ERT: Install library"
+  )
   set(ERT_USE_OPENMP
       ${OPENMP_FOUND}
-      CACHE BOOL "ERT: Compile using OpenMP")
+      CACHE BOOL "ERT: Compile using OpenMP"
+  )
 
   # Remember original state
   set(ORIGINAL_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
@@ -189,7 +202,8 @@ else()
   else()
     set(RESINSIGHT_ERT_EXTERNAL_SOURCE_ROOT
         ""
-        CACHE STRING "Path to ERT CMakeList.txt (source path)")
+        CACHE STRING "Path to ERT CMakeList.txt (source path)"
+    )
 
     # Force dynamic linking on other platforms Copy of libraries into install
     # folder of ResInsight is done a bit further down in this file
@@ -197,8 +211,9 @@ else()
   endif()
 
   if(RESINSIGHT_ERT_EXTERNAL_SOURCE_ROOT)
-    add_subdirectory(${RESINSIGHT_ERT_EXTERNAL_SOURCE_ROOT}
+    add_subdirectory(
-                     ${CMAKE_BINARY_DIR}/ThirdParty/Ert)
+      ${RESINSIGHT_ERT_EXTERNAL_SOURCE_ROOT} ${CMAKE_BINARY_DIR}/ThirdParty/Ert
+    )
   else()
     add_subdirectory(ThirdParty/Ert)
   endif()
@@ -215,7 +230,8 @@ else()
     set_target_properties(
       ecl
       PROPERTIES COMPILE_FLAGS
-                 "-Wno-deprecated -Wno-deprecated-declarations -Wno-clobbered")
+                 "-Wno-deprecated -Wno-deprecated-declarations -Wno-clobbered"
+    )
   endif()
 
   list(APPEND THIRD_PARTY_LIBRARIES ecl)
@@ -252,7 +268,8 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
         COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive --
                 ${SUBDIR}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        RESULT_VARIABLE GIT_SUBMOD_RESULT)
+        RESULT_VARIABLE GIT_SUBMOD_RESULT
+      )
       if(NOT GIT_SUBMOD_RESULT EQUAL "0")
         message(
           FATAL_ERROR
@@ -283,7 +300,8 @@ if(buildcache_program)
     if(CMAKE_CXX_FLAGS_DEBUG MATCHES "/Zi")
       message(STATUS "Clearing pdb setting")
       string(REGEX REPLACE "/Zi" "" CMAKE_CXX_FLAGS_DEBUG
-                           "${CMAKE_CXX_FLAGS_DEBUG}")
+                           "${CMAKE_CXX_FLAGS_DEBUG}"
+      )
     endif()
 
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Z7")
@@ -298,13 +316,15 @@ endif()
 if(MSVC)
   set(RESINSIGHT_HDF5_DIR
       ""
-      CACHE PATH "Windows Only: Optional path to HDF5 libraries on Windows")
+      CACHE PATH "Windows Only: Optional path to HDF5 libraries on Windows"
+  )
 endif()
 
 if(MSVC)
   if(NOT ${RESINSIGHT_HDF5_DIR} EQUAL "")
     list(APPEND EXTERNAL_LINK_LIBRARIES ${RESINSIGHT_HDF5_DIR}/lib/hdf5.lib
-         ${RESINSIGHT_HDF5_DIR}/lib/hdf5_cpp.lib)
+         ${RESINSIGHT_HDF5_DIR}/lib/hdf5_cpp.lib
+    )
 
     set(RESINSIGHT_FOUND_HDF5 1)
     message(STATUS "Using HDF5 from : ${RESINSIGHT_HDF5_DIR}")
@@ -349,7 +369,8 @@ add_subdirectory(ThirdParty/custom-opm-common)
 add_subdirectory(ThirdParty/custom-opm-common/custom-opm-parser-tests)
 
 list(APPEND OPM_LIBRARIES custom-opm-flowdiagnostics custom-opm-flowdiag-app
-     custom-opm-common)
+     custom-opm-common
+)
 
 set_property(TARGET ${OPM_LIBRARIES} PROPERTY FOLDER "Thirdparty/OPM")
 
@@ -373,7 +394,8 @@ find_package(
              Script
              ScriptTools
              Widgets
-  OPTIONAL_COMPONENTS Charts)
+  OPTIONAL_COMPONENTS Charts
+)
 if(Qt5Charts_FOUND)
   message(STATUS "QtCharts found: ${Qt5Charts_LIBRARIES}")
   add_definitions(-DUSE_QTCHARTS)
@@ -446,7 +468,8 @@ if(CMAKE_COMPILER_IS_GNUCC)
             __sync_fetch_and_add(&a, 1);
             __sync_sub_and_fetch(&a, 1);
             __sync_fetch_and_sub(&a, 1); }"
-      HAVE_GCC_SYNC_FUNCTIONS)
+      HAVE_GCC_SYNC_FUNCTIONS
+    )
   endif()
 
   if(HAVE_GCC_SYNC_FUNCTIONS)
@@ -474,7 +497,8 @@ list(
   LibViewing
   LibRender
   LibGeometry
-  LibCore)
+  LibCore
+)
 
 set_property(TARGET ${VIZ_FWK_LIBRARIES} PROPERTY FOLDER "VizFwk")
 
@@ -520,7 +544,8 @@ list(
   cafTensor
   CommonCode
   cafVizExtensions
-  cafPdmScripting)
+  cafPdmScripting
+)
 
 set_property(TARGET ${APP_FWK_LIBRARIES} PROPERTY FOLDER "AppFwk")
 
@@ -530,11 +555,13 @@ mark_as_advanced(FORCE RESINSIGHT_INCLUDE_APPFWK_TESTS)
 if(RESINSIGHT_INCLUDE_APPFWK_TESTS)
   # Unit Tests
   add_subdirectory(Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests)
-  set_property(TARGET cafProjectDataModel_UnitTests PROPERTY FOLDER
+  set_property(
-                                                             "AppFwkTests")
+    TARGET cafProjectDataModel_UnitTests PROPERTY FOLDER "AppFwkTests"
+  )
 
   add_subdirectory(
-    Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests)
+    Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests
+  )
   set_property(TARGET cafPdmCore_UnitTests PROPERTY FOLDER "AppFwkTests")
 
   add_subdirectory(Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests)
@@ -560,7 +587,8 @@ set(RESINSIGHT_INSTALL_FOLDER ".")
 # override system install prefix if private installation chosen
 option(RESINSIGHT_PRIVATE_INSTALL
        "Linux only: Install the libecl shared libraries along the executable"
-       ON)
+       ON
+)
 mark_as_advanced(FORCE RESINSIGHT_PRIVATE_INSTALL)
 
 if(RESINSIGHT_PRIVATE_INSTALL)
@@ -577,7 +605,8 @@ if(RESINSIGHT_PRIVATE_INSTALL)
         ${CMAKE_BINARY_DIR}/ThirdParty/Ert/${CMAKE_INSTALL_LIBDIR}/libecl.so.2.4
     )
     install(FILES ${ERT_SHARED_LIB_FILES}
-            DESTINATION ${RESINSIGHT_INSTALL_FOLDER})
+            DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
+    )
   endif()
 
   if(APPLE)
@@ -588,7 +617,8 @@ if(RESINSIGHT_PRIVATE_INSTALL)
     )
     install(
       FILES ${ERT_SHARED_LIB_FILES}
-      DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/ResInsight.app/Contents/MacOS)
+      DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/ResInsight.app/Contents/MacOS
+    )
   endif()
 
 endif(RESINSIGHT_PRIVATE_INSTALL)
@@ -602,7 +632,8 @@ if(RESINSIGHT_HDF5_BUNDLE_LIBRARIES)
       if(${POS_IN_STRING} GREATER -1)
         file(GLOB FILE_AND_SYMLINKS ${FILE_TO_COPY}*)
         install(FILES ${FILE_AND_SYMLINKS}
-                DESTINATION ${RESINSIGHT_INSTALL_FOLDER})
+                DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
+        )
       endif()
     endforeach()
   endif()
@@ -610,7 +641,8 @@ endif(RESINSIGHT_HDF5_BUNDLE_LIBRARIES)
 
 if(RESINSIGHT_BUNDLE_TESTMODELS)
   install(DIRECTORY ${CMAKE_SOURCE_DIR}/TestModels
-          DESTINATION ${RESINSIGHT_INSTALL_FOLDER})
+          DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
+  )
 endif()
 
 # ##############################################################################
@@ -628,14 +660,16 @@ if(OCTAVE_MKOCTFILE)
   add_subdirectory(OctavePlugin)
 else(OCTAVE_MKOCTFILE)
   message(
-    STATUS "Could not find OCTAVE_MKOCTFILE, skipping OctavePlugin library")
+    STATUS "Could not find OCTAVE_MKOCTFILE, skipping OctavePlugin library"
+  )
 endif(OCTAVE_MKOCTFILE)
 
 # ##############################################################################
 # Code documentation using Doxygen
 # ##############################################################################
 option(RESINSIGHT_BUILD_DOCUMENTATION
-       "Use Doxygen to create the HTML based API documentation" OFF)
+       "Use Doxygen to create the HTML based API documentation" OFF
+)
 if(RESINSIGHT_BUILD_DOCUMENTATION)
   find_package(Doxygen)
   if(NOT DOXYGEN_FOUND)
@@ -650,7 +684,8 @@ if(RESINSIGHT_BUILD_DOCUMENTATION)
   add_custom_target(
     Docs
     COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile
-    SOURCES ${PROJECT_BINARY_DIR}/Doxyfile)
+    SOURCES ${PROJECT_BINARY_DIR}/Doxyfile
+  )
   # IF you do NOT want the documentation to be generated EVERY time you build
   # the project then leave out the 'ALL' keyword from the above command.
 endif(RESINSIGHT_BUILD_DOCUMENTATION)

Fwk/AppFwk/CMakeLists.txt

@@ -20,13 +20,15 @@ if(CEE_USE_QT5)
   find_package(
     Qt5
     COMPONENTS
-    REQUIRED Core Gui OpenGL Widgets)
+    REQUIRED Core Gui OpenGL Widgets
+  )
   set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
 else()
   find_package(
     Qt4
     COMPONENTS QtCore QtGui QtMain QtOpenGl
-    REQUIRED)
+    REQUIRED
+  )
   include(${QT_USE_FILE})
 endif(CEE_USE_QT5)
 
@@ -70,5 +72,7 @@ add_subdirectory(cafPdmScripting/cafPdmScripting_UnitTests)
 # folders
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-set_property(TARGET cafPdmCore cafPdmCore_UnitTests cafPdmXml
+set_property(
-                    cafPdmXml_UnitTests cafPdmUiCore PROPERTY FOLDER "PdmCore")
+  TARGET cafPdmCore cafPdmCore_UnitTests cafPdmXml cafPdmXml_UnitTests
+         cafPdmUiCore PROPERTY FOLDER "PdmCore"
+)

Fwk/AppFwk/CommonCode/CMakeLists.txt

@@ -19,7 +19,8 @@ set(MOC_HEADER_FILES cafMessagePanel.h)
 find_package(
   Qt5
   COMPONENTS
-  REQUIRED Core Gui Widgets OpenGL)
+  REQUIRED Core Gui Widgets OpenGL
+)
 set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
 qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
 
@@ -50,7 +51,8 @@ add_library(
   cvfStructGridScalarDataAccess.h
   cafVecIjk.cpp
   cafVecIjk.h
-  ${MOC_SOURCE_FILES})
+  ${MOC_SOURCE_FILES}
+)
 
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -62,11 +64,13 @@ target_link_libraries(
   LibRender
   LibGuiQt
   cafPdmCore
-  ${QT_LIBRARIES})
+  ${QT_LIBRARIES}
+)
 
 if(MSVC)
-  set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
+  set_target_properties(
-                                                   "/W4 /wd4100 /wd4127")
+    ${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127"
+  )
 endif()
 
 source_group("" FILES ${PROJECT_FILES})

Fwk/AppFwk/cafAnimControl/CMakeLists.txt

@@ -10,12 +10,14 @@ endif()
 
 # Qt
 set(MOC_HEADER_FILES cafFrameAnimationControl.h cafAnimationToolBar.h
-                     cafPopupMenuButton.h)
+                     cafPopupMenuButton.h
+)
 
 find_package(
   Qt5
   COMPONENTS
-  REQUIRED Core Gui Widgets)
+  REQUIRED Core Gui Widgets
+)
 set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
 qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
 
@@ -28,12 +30,14 @@ qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
 
 set(QRC_FILES
     ${QRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/Resources/cafAnimControl.qrc
-    PARENT_SCOPE)
+    PARENT_SCOPE
+)
 
 set(PROJECT_FILES
     cafFrameAnimationControl.h cafFrameAnimationControl.cpp
     cafAnimationToolBar.h cafAnimationToolBar.cpp cafPopupMenuButton.h
-    cafPopupMenuButton.cpp)
+    cafPopupMenuButton.cpp
+)
 
 add_library(${PROJECT_NAME} ${PROJECT_FILES} ${MOC_SOURCE_FILES})
 

Fwk/AppFwk/cafCommand/CMakeLists.txt

@@ -15,7 +15,8 @@ set(MOC_HEADER_FILES cafCmdFeature.h cafCmdFeatureManager.h)
 find_package(
   Qt5
   COMPONENTS
-  REQUIRED Core Gui Widgets)
+  REQUIRED Core Gui Widgets
+)
 set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
 qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
 
@@ -36,7 +37,8 @@ set(PROJECT_FILES
     cafCmdFeatureManager.cpp
     cafCmdFeatureManager.h
     cafCmdFeatureMenuBuilder.cpp
-    cafCmdFeatureMenuBuilder.h)
+    cafCmdFeatureMenuBuilder.h
+)
 
 add_library(${PROJECT_NAME} ${PROJECT_FILES} ${MOC_SOURCE_FILES})
 
@@ -45,8 +47,9 @@ target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(${PROJECT_NAME} cafProjectDataModel ${QT_LIBRARIES})
 
 if(MSVC)
-  set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
+  set_target_properties(
-                                                   "/W4 /wd4100 /wd4127")
+    ${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127"
+  )
 endif()
 
 source_group("" FILES ${PROJECT_FILES})

Fwk/AppFwk/cafCommandFeatures/CMakeLists.txt

@@ -15,7 +15,8 @@ set(MOC_HEADER_FILES)
 find_package(
   Qt5
   COMPONENTS
-  REQUIRED Core Gui Widgets)
+  REQUIRED Core Gui Widgets
+)
 set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
 qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
 
@@ -42,7 +43,8 @@ set(PROJECT_FILES
     ToggleCommands/cafToggleItemsOnFeature.cpp
     ToggleCommands/cafToggleItemsOnFeature.h
     ToggleCommands/cafToggleItemsOnOthersOffFeature.cpp
-    ToggleCommands/cafToggleItemsOnOthersOffFeature.h)
+    ToggleCommands/cafToggleItemsOnOthersOffFeature.h
+)
 
 # NOTE! Resources in this subfolder appends to the variable QRC_FILES in parent
 # scope CMakeList.txt in the application folder (parent scope) must use the
@@ -53,7 +55,8 @@ set(PROJECT_FILES
 
 set(QRC_FILES
     ${QRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/Resources/cafCommandFeatures.qrc
-    PARENT_SCOPE)
+    PARENT_SCOPE
+)
 
 # NOTE! Adding the library as a cmake "OBJECT" library to make sure the linker
 # is not pruning the seemingly unused features, and to make sure that the static
@@ -88,8 +91,9 @@ set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
 # ${PROJECT_NAME} cafCommand cafUserInterface ${QT_LIBRARIES} )
 
 if(MSVC)
-  set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
+  set_target_properties(
-                                                   "/W4 /wd4100 /wd4127")
+    ${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127"
+  )
 endif()
 
 source_group("" FILES ${PROJECT_FILES})

Fwk/AppFwk/cafHexInterpolator/cafHexInterpolator_UnitTest/CMakeLists.txt

@@ -19,7 +19,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
 )
 
 set(PROJECT_FILES cafHexInterpolatorBasicTest.cpp
-                  cafHexInterpolator_UnitTests_main.cpp)
+                  cafHexInterpolator_UnitTests_main.cpp
+)
 
 # add the executable
 add_executable(${PROJECT_NAME} ${PROJECT_FILES} gtest/gtest-all.cpp)

Fwk/AppFwk/cafPdmCvf/CMakeLists.txt

@@ -12,7 +12,8 @@ endif()
 find_package(
   Qt5
   COMPONENTS
-  REQUIRED Core Gui Widgets)
+  REQUIRED Core Gui Widgets
+)
 set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
 qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
 
@@ -44,11 +45,13 @@ add_library(
   cafPdmMat3d/cafPdmXmlMat3d.h
   cafPdmMat3d/cafPdmFieldCvfMat3d.h
   ${MOC_HEADER_FILES}
-  ${MOC_SOURCE_FILES})
+  ${MOC_SOURCE_FILES}
+)
 
 target_include_directories(
   ${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-                         ${CMAKE_CURRENT_SOURCE_DIR}/cafPdmMat3d)
+                         ${CMAKE_CURRENT_SOURCE_DIR}/cafPdmMat3d
+)
 
 target_link_libraries(${PROJECT_NAME} cafUserInterface LibCore ${QT_LIBRARIES})
 

Fwk/AppFwk/cafPdmCvf/cafPdmCvf_UnitTests/CMakeLists.txt

@@ -7,7 +7,8 @@ else()
   find_package(
     Qt4
     COMPONENTS QtCore
-    REQUIRED)
+    REQUIRED
+  )
   include(${QT_USE_FILE})
 endif(Qt5Core_FOUND)
 
@@ -15,11 +16,13 @@ project(cafPdmCvf_UnitTests)
 
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR} ${cafPdmCore_SOURCE_DIR} ${cafPdmXml_SOURCE_DIR}
-  ${cafPdmCvf_SOURCE_DIR} ${LibCore_SOURCE_DIR})
+  ${cafPdmCvf_SOURCE_DIR} ${LibCore_SOURCE_DIR}
+)
 
 set(PROJECT_FILES
     cafPdmCvf_UnitTests.cpp gtest/gtest-all.cpp cafPdmCoreVec3dTest.cpp
-    cafPdmCoreColor3fTest.cpp cafPdmCoreMat4dTest.cpp)
+    cafPdmCoreColor3fTest.cpp cafPdmCoreMat4dTest.cpp
+)
 
 # add the executable
 add_executable(${PROJECT_NAME} ${PROJECT_FILES})
@@ -30,8 +33,9 @@ endif()
 
 source_group("" FILES ${PROJECT_FILES})
 
-target_link_libraries(${PROJECT_NAME} cafPdmCore cafPdmXml LibCore cafPdmCvf
+target_link_libraries(
-                      ${QT_LIBRARIES})
+  ${PROJECT_NAME} cafPdmCore cafPdmXml LibCore cafPdmCvf ${QT_LIBRARIES}
+)
 
 # Copy Qt Dlls
 if(Qt5Core_FOUND)
@@ -40,7 +44,8 @@ if(Qt5Core_FOUND)
       TARGET ${PROJECT_NAME}
       POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
-              $<TARGET_FILE_DIR:${PROJECT_NAME}>)
+              $<TARGET_FILE_DIR:${PROJECT_NAME}>
+    )
   endforeach(qtlib)
   # Copy Qt Dlls
 else()
@@ -52,12 +57,14 @@ else()
       # Debug
       execute_process(
         COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}d4.dll
-                ${CMAKE_BINARY_DIR}/Debug/${qtlib}d4.dll)
+                ${CMAKE_BINARY_DIR}/Debug/${qtlib}d4.dll
+      )
 
       # Release
       execute_process(
         COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}4.dll
-                ${CMAKE_BINARY_DIR}/Release/${qtlib}4.dll)
+                ${CMAKE_BINARY_DIR}/Release/${qtlib}4.dll
+      )
     endforeach(qtlib)
   endif(MSVC)
 endif(Qt5Core_FOUND)

Fwk/AppFwk/cafPdmScripting/CMakeLists.txt

@@ -31,7 +31,8 @@ set(PROJECT_FILES
     cafPdmMarkdownGenerator.h
     cafPdmMarkdownGenerator.cpp
     cafPdmMarkdownBuilder.h
-    cafPdmMarkdownBuilder.cpp)
+    cafPdmMarkdownBuilder.cpp
+)
 
 set(CAF_LIBS cafProjectDataModel)
 
@@ -42,7 +43,8 @@ if(CAF_CVF_SCRIPTING)
     cafPdmFieldScriptingCapabilityCvfColor3.h
     cafPdmFieldScriptingCapabilityCvfColor3.cpp
     cafPdmFieldScriptingCapabilityCvfVec3d.h
-    cafPdmFieldScriptingCapabilityCvfVec3d.cpp)
+    cafPdmFieldScriptingCapabilityCvfVec3d.cpp
+  )
   list(APPEND CAF_LIBS cafPdmCvf)
 endif()
 

Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/CMakeLists.txt

@@ -5,7 +5,8 @@ project(cafPdmScripting_UnitTests)
 find_package(
   Qt5
   COMPONENTS
-  REQUIRED Core Xml Gui)
+  REQUIRED Core Xml Gui
+)
 set(QT_LIBRARIES Qt5::Core Qt5::Xml Qt5::Gui)
 
 if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
@@ -22,11 +23,14 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
 )
 
 # add the executable
-add_executable(${PROJECT_NAME} cafPdmScripting_UnitTests.cpp
+add_executable(
-                               gtest/gtest-all.cpp cafPdmScriptingBasicTest.cpp)
+  ${PROJECT_NAME} cafPdmScripting_UnitTests.cpp gtest/gtest-all.cpp
+                  cafPdmScriptingBasicTest.cpp
+)
 
-target_link_libraries(${PROJECT_NAME} cafPdmScripting ${QT_LIBRARIES}
+target_link_libraries(
-                      ${THREAD_LIBRARY})
+  ${PROJECT_NAME} cafPdmScripting ${QT_LIBRARIES} ${THREAD_LIBRARY}
+)
 
 source_group("" FILES ${PROJECT_FILES})
 
@@ -37,6 +41,7 @@ if(Qt5Core_FOUND)
       TARGET ${PROJECT_NAME}
       POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
-              $<TARGET_FILE_DIR:${PROJECT_NAME}>)
+              $<TARGET_FILE_DIR:${PROJECT_NAME}>
+    )
   endforeach(qtlib)
 endif(Qt5Core_FOUND)

Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt

@@ -12,7 +12,8 @@ endif()
 find_package(
   Qt5
   COMPONENTS
-  REQUIRED Core Gui Widgets)
+  REQUIRED Core Gui Widgets
+)
 set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
 
 set(PROJECT_FILES
@@ -23,7 +24,8 @@ set(PROJECT_FILES
     cafPdmObjectGroup.cpp
     cafPdmObjectGroup.h
     cafPdmObject.cpp
-    cafPdmObject.h)
+    cafPdmObject.h
+)
 
 add_library(${PROJECT_NAME} ${PROJECT_FILES})
 
@@ -32,8 +34,9 @@ target_link_libraries(${PROJECT_NAME} cafPdmUiCore cafPdmXml ${QT_LIBRARIES})
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 if(MSVC)
-  set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
+  set_target_properties(
-                                                   "/W4 /wd4100 /wd4127")
+    ${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127"
+  )
 endif()
 
 source_group("" FILES ${PROJECT_FILES})

Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt

@@ -11,7 +11,8 @@ endif()
 find_package(
   Qt5
   COMPONENTS
-  REQUIRED Core)
+  REQUIRED Core
+)
 set(QT_LIBRARIES Qt5::Core)
 
 set(PROJECT_FILES
@@ -58,7 +59,8 @@ set(PROJECT_FILES
     cafAsyncObjectDeleter.h
     cafAsyncObjectDeleter.inl
     cafAsyncWorkerManager.h
-    cafAsyncWorkerManager.cpp)
+    cafAsyncWorkerManager.cpp
+)
 
 add_library(${PROJECT_NAME} ${PROJECT_FILES})
 
@@ -67,8 +69,9 @@ target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
 
 if(MSVC)
-  set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
+  set_target_properties(
-                                                   "/W4 /wd4100 /wd4127")
+    ${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127"
+  )
 endif()
 
 source_group("" FILES ${PROJECT_FILES})

Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt

@@ -6,7 +6,8 @@ project(cafPdmCore_UnitTests)
 find_package(
   Qt5
   COMPONENTS
-  REQUIRED Core Gui Widgets)
+  REQUIRED Core Gui Widgets
+)
 set(QT_LIBRARIES Qt5::Core Qt5::Widgets Qt5::Gui)
 
 if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
@@ -34,7 +35,8 @@ set(PROJECT_FILES
     Parent.cpp
     Parent.h
     TestObj.cpp
-    TestObj.h)
+    TestObj.h
+)
 
 # add the executable
 add_executable(${PROJECT_NAME} ${PROJECT_FILES})
@@ -45,8 +47,9 @@ if(Qt5Core_FOUND)
   set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
 endif()
 
-target_link_libraries(${PROJECT_NAME} cafPdmCore ${QT_LIBRARIES}
+target_link_libraries(
-                      ${THREAD_LIBRARY})
+  ${PROJECT_NAME} cafPdmCore ${QT_LIBRARIES} ${THREAD_LIBRARY}
+)
 
 # Copy Qt Dlls
 foreach(qtlib ${QT_LIBRARIES})
@@ -54,5 +57,6 @@ foreach(qtlib ${QT_LIBRARIES})
     TARGET ${PROJECT_NAME}
     POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
-            $<TARGET_FILE_DIR:${PROJECT_NAME}>)
+            $<TARGET_FILE_DIR:${PROJECT_NAME}>
+  )
 endforeach(qtlib)

Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt

@@ -10,13 +10,15 @@ endif()
 
 # These headers need to go through Qt's MOC compiler
 set(MOC_HEADER_FILES cafPdmUiEditorHandle.h cafPdmUiFieldEditorHandle.h
-                     cafPdmUiSelection3dEditorVisualizer.h cafQShortenedLabel.h)
+                     cafPdmUiSelection3dEditorVisualizer.h cafQShortenedLabel.h
+)
 
 # Qt
 find_package(
   Qt5
   COMPONENTS
-  REQUIRED Core Gui Widgets)
+  REQUIRED Core Gui Widgets
+)
 set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
 qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
 
@@ -69,7 +71,8 @@ set(PROJECT_FILES
     cafIconProvider.cpp
     cafIconProvider.h
     cafFontTools.cpp
-    cafFontTools.h)
+    cafFontTools.h
+)
 
 # NOTE! Resources in this subfolder appends to the variable QRC_FILES in parent
 # scope CMakeList.txt in the application folder (parent scope) must use the
@@ -80,7 +83,8 @@ set(PROJECT_FILES
 
 set(QRC_FILES
     ${QRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/Resources/caf.qrc
-    PARENT_SCOPE)
+    PARENT_SCOPE
+)
 
 add_library(${PROJECT_NAME} ${PROJECT_FILES} ${MOC_SOURCE_FILES})
 
@@ -89,8 +93,9 @@ target_link_libraries(${PROJECT_NAME} cafPdmCore ${QT_LIBRARIES})
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 if(MSVC)
-  set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
+  set_target_properties(
-                                                   "/W4 /wd4100 /wd4127")
+    ${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127"
+  )
 endif()
 
 source_group("" FILES ${PROJECT_FILES})

Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt

@@ -12,7 +12,8 @@ endif()
 find_package(
   Qt5
   COMPONENTS
-  REQUIRED Core Xml)
+  REQUIRED Core Xml
+)
 set(QT_LIBRARIES Qt5::Core Qt5::Xml)
 
 include_directories(..)
@@ -38,7 +39,8 @@ set(PROJECT_FILES
     cafPdmObjectFactory.h
     cafPdmSettings.h
     cafPdmSettings.cpp
-    cafPdmXmlStringValidation.h)
+    cafPdmXmlStringValidation.h
+)
 
 add_library(${PROJECT_NAME} ${PROJECT_FILES})
 
@@ -47,8 +49,9 @@ target_link_libraries(${PROJECT_NAME} cafPdmCore ${QT_LIBRARIES})
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 if(MSVC)
-  set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
+  set_target_properties(
-                                                   "/W4 /wd4100 /wd4127")
+    ${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127"
+  )
 endif()
 
 source_group("" FILES ${PROJECT_FILES})

Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt

@@ -5,7 +5,8 @@ project(cafPdmXml_UnitTests)
 find_package(
   Qt5
   COMPONENTS
-  REQUIRED Core Xml)
+  REQUIRED Core Xml
+)
 set(QT_LIBRARIES Qt5::Core Qt5::Xml)
 
 if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
@@ -25,14 +26,16 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
 add_executable(
   ${PROJECT_NAME}
   cafPdmXml_UnitTests.cpp gtest/gtest-all.cpp cafPdmXmlBasicTest.cpp
-  cafPdmAdvancedTemplateTest.cpp cafPdmXmlNumberTest.cpp cafPdmPtrArrayTest.cpp)
+  cafPdmAdvancedTemplateTest.cpp cafPdmXmlNumberTest.cpp cafPdmPtrArrayTest.cpp
+)
 
 if(Qt5Core_FOUND)
   set(QT_LIBRARIES Qt5::Core Qt5::Xml)
 endif()
 
-target_link_libraries(${PROJECT_NAME} cafPdmXml ${QT_LIBRARIES}
+target_link_libraries(
-                      ${THREAD_LIBRARY})
+  ${PROJECT_NAME} cafPdmXml ${QT_LIBRARIES} ${THREAD_LIBRARY}
+)
 
 source_group("" FILES ${PROJECT_FILES})
 
@@ -43,6 +46,7 @@ if(Qt5Core_FOUND)
       TARGET ${PROJECT_NAME}
       POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
-              $<TARGET_FILE_DIR:${PROJECT_NAME}>)
+              $<TARGET_FILE_DIR:${PROJECT_NAME}>
+    )
   endforeach(qtlib)
 endif(Qt5Core_FOUND)

Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt

@@ -6,7 +6,8 @@ project(cafProjectDataModel_UnitTests)
 find_package(
   Qt5
   COMPONENTS
-  REQUIRED Core Xml Gui)
+  REQUIRED Core Xml Gui
+)
 set(QT_LIBRARIES Qt5::Core Qt5::Xml Qt5::Gui)
 
 if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
@@ -23,13 +24,15 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
 )
 
 set(PROJECT_FILES cafPdmBasicTest.cpp cafProjectDataModel_UnitTests.cpp
-                  Child.cpp Parent.cpp TestObj.cpp)
+                  Child.cpp Parent.cpp TestObj.cpp
+)
 
 # add the executable
 add_executable(${PROJECT_NAME} ${PROJECT_FILES} gtest/gtest-all.cpp)
 
-target_link_libraries(${PROJECT_NAME} cafProjectDataModel ${QT_LIBRARIES}
+target_link_libraries(
-                      ${THREAD_LIBRARY})
+  ${PROJECT_NAME} cafProjectDataModel ${QT_LIBRARIES} ${THREAD_LIBRARY}
+)
 
 source_group("" FILES ${PROJECT_FILES})
 
@@ -39,5 +42,6 @@ foreach(qtlib ${QT_LIBRARIES})
     TARGET ${PROJECT_NAME}
     POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
-            $<TARGET_FILE_DIR:${PROJECT_NAME}>)
+            $<TARGET_FILE_DIR:${PROJECT_NAME}>
+  )
 endforeach(qtlib)