Commit 6bf21bde authored by Mark Olesen's avatar Mark Olesen

STYLE: adjust naming of CMakeLists and comments in Allwmake

parent a9910934
......@@ -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
......
......@@ -35,6 +35,6 @@ message("================")
#-----------------------------------------------------------------------------
include(CMakeLists-Catalyst.txt)
include(CMakeLists-Project.txt)
#-----------------------------------------------------------------------------
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment