zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: include mpi information for versioned cmake build

Browse Source 
- since the wrapped cmake calls generally use the regular build
  locations, add in MPI information to properly handle changes
  in that as well. This makes it easier to build for multiple MPI
  instances.
This commit is contained in:
Mark Olesen
2021-02-11 12:06:39 +01:00
parent 2954f55f6a
commit f997013eb8
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wmake/scripts/cmakeFunctions
View File

@ -5,7 +5,7 @@
# \\ / A nd | www.openfoam.com
# \\/ M anipulation |
#------------------------------------------------------------------------------
# Copyright (C) 2017-2020 OpenCFD Ltd.
# Copyright (C) 2017-2021 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@ -76,13 +76,12 @@ cmakeVersioned()
objectsDir=$(findObjectDir "$sourceDir") || exit 1 # Fatal
# Version changed
sentinel=$(sameDependency "$sourceDir" "$depend" $@) || \
sentinel=$(sameDependency "$sourceDir" "$depend" "MPLIB=$WM_MPLIB" "MPI=$FOAM_MPI" "$@") || \
rm -rf "$objectsDir" 2>/dev/null
mkdir -p "$objectsDir" \
&& ( cd "$objectsDir" && call_cmake "$@" "$sourceDir" && \
make ) \
&& storeDependency "$sentinel" "$depend" $@
&& ( cd "$objectsDir" && call_cmake "$@" "$sourceDir" && make ) \
&& storeDependency "$sentinel" "$depend" "MPLIB=$WM_MPLIB" "MPI=$FOAM_MPI" "$@"
}
@ -103,13 +102,12 @@ cmakeVersionedInstall()
objectsDir=$(findObjectDir "$sourceDir") || exit 1 # Fatal
# Version changed
sentinel=$(sameDependency "$sourceDir" "$depend" $@) || \
sentinel=$(sameDependency "$sourceDir" "$depend" "MPLIB=$WM_MPLIB" "MPI=$FOAM_MPI" "$@") || \
rm -rf "$objectsDir" 2>/dev/null
mkdir -p "$objectsDir" \
&& ( cd "$objectsDir" && call_cmake "$@" "$sourceDir" && \
make install ) \
&& storeDependency "$sentinel" "$depend" $@
&& ( cd "$objectsDir" && call_cmake "$@" "$sourceDir" && make install ) \
&& storeDependency "$sentinel" "$depend" "MPLIB=$WM_MPLIB" "MPI=$FOAM_MPI" "$@"
}
@ -131,12 +129,12 @@ wmakeVersioned()
objectsDir=$(findObjectDir "$sourceDir") || exit 1 # Fatal
# Version changed
sentinel=$(sameDependency "$sourceDir" "$depend" $@) || \
sentinel=$(sameDependency "$sourceDir" "$depend" "MPLIB=$WM_MPLIB" "MPI=$FOAM_MPI" "$@") || \
rm -rf "$objectsDir" 2>/dev/null
mkdir -p "$objectsDir" \
&& wmake "$@" \
&& storeDependency "$sentinel" "$depend" $@
&& storeDependency "$sentinel" "$depend" "MPLIB=$WM_MPLIB" "MPI=$FOAM_MPI" "$@"
}