From 6bf21bdef607376a577c570e7f66919a01a64448 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 29 Nov 2018 10:29:45 +0100
Subject: [PATCH] STYLE: adjust naming of CMakeLists and comments in Allwmake

---
 src/catalyst/Allwmake                           | 17 ++++++++++++-----
 ...ists-Catalyst.txt => CMakeLists-Project.txt} |  0
 src/catalyst/CMakeLists.txt                     |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)
 rename src/catalyst/{CMakeLists-Catalyst.txt => CMakeLists-Project.txt} (100%)

diff --git a/src/catalyst/Allwmake b/src/catalyst/Allwmake
index 0dcd54a..b69d3c9 100755
--- a/src/catalyst/Allwmake
+++ b/src/catalyst/Allwmake
@@ -3,14 +3,21 @@ cd ${0%/*} || exit 1                            # Run from this directory
 . $WM_PROJECT_DIR/wmake/scripts/cmakeFunctions  # The cmake functions
 
 # CMake into objectsDir with external dependency
-# - Can this function can be removed with OpenFOAM-1812 ?
+#
+# 1 - depend
+# 2 - sourceDir
+# 3... optional cmake defines
+#
+# Available directly in OpenFOAM-1812 but left here for a while
+# to ensure we can build with slightly older versions too (2018-11-29)
+#
 unset -f cmakeVersionedInstall 2>/dev/null
 cmakeVersionedInstall()
 {
     local depend="$1"
     local sourceDir="$2"
-    local objectsDir
     shift 2
+    local objectsDir sentinel
 
     # Where generated files are stored
     objectsDir=$(findObjectDir "$sourceDir") || exit 1 # Fatal
@@ -19,8 +26,8 @@ cmakeVersionedInstall()
     sentinel=$(sameDependency "$depend" "$sourceDir") || \
         rm -rf "$objectsDir" > /dev/null 2>&1
 
-    mkdir -p $objectsDir \
-    && (cd $objectsDir && _cmake "$@" $sourceDir && make install) \
+    mkdir -p "$objectsDir" \
+    && (cd "$objectsDir" && _cmake "$@" "$sourceDir" && make install) \
     && echo "$depend" >| "${sentinel:-/dev/null}"
 }
 
@@ -52,7 +59,7 @@ then
     then
         if command -v cmake > /dev/null 2>&1
         then
-            cmakeVersionedInstall "$depend" $PWD "$cmakeOpts" || {
+            cmakeVersionedInstall "$depend" "$PWD" "$cmakeOpts" || {
                 echo
                 echo "    WARNING: incomplete build of ParaView Catalyst"
                 echo
diff --git a/src/catalyst/CMakeLists-Catalyst.txt b/src/catalyst/CMakeLists-Project.txt
similarity index 100%
rename from src/catalyst/CMakeLists-Catalyst.txt
rename to src/catalyst/CMakeLists-Project.txt
diff --git a/src/catalyst/CMakeLists.txt b/src/catalyst/CMakeLists.txt
index 7494a11..b6b1b41 100644
--- a/src/catalyst/CMakeLists.txt
+++ b/src/catalyst/CMakeLists.txt
@@ -35,6 +35,6 @@ message("================")
 
 #-----------------------------------------------------------------------------
 
-include(CMakeLists-Catalyst.txt)
+include(CMakeLists-Project.txt)
 
 #-----------------------------------------------------------------------------
-- 
GitLab