Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
ThirdParty-common
Commits
4f844dab
Commit
4f844dab
authored
Jun 19, 2018
by
Mark OLESEN
Browse files
STYLE: use _foamConfig function instead of _foamEtc -config
parent
d446ee8b
Changes
17
Hide whitespace changes
Inline
Side-by-side
etc/tools/ThirdPartyFunctions
View file @
4f844dab
...
...
@@ -125,7 +125,7 @@ requireWMakeToolchain()
# Some functions as per OpenFOAM etc/config.sh/functions
unset
-f
_foamAddLib _foamAddLibAuto _foamAddMan _foamAddPath
# Get settings only
unset
-f
_foamClean _foam
Etc
unset
-f
_foamClean _foam
Config
if
[
-x
"
$WM_PROJECT_DIR
/bin/foamCleanPath"
]
then
...
...
@@ -140,8 +140,8 @@ else
_foamClean
()
{
echo
"No foamCleanPath"
1>&2
;
}
fi
# Source an etc file
_foam
Etc
()
{
eval
"
$(
$WM_PROJECT_DIR
/bin/foamEtcFile
-sh
$@
)
"
;
}
# Source an etc
/config.sh
file
_foam
Config
()
{
eval
"
$(
$WM_PROJECT_DIR
/bin/foamEtcFile
-sh
-config
$@
)
"
;
}
#------------------------------------------------------------------------------
...
...
makeADIOS
View file @
4f844dab
...
...
@@ -29,7 +29,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
#------------------------------------------------------------------------------
# ADIOS version from OpenFOAM etc/config.sh file:
_foam
Etc
-c
onfig
ADIOS
_foam
C
onfig ADIOS
adiosPACKAGE
=
${
adios_version
:-
adios
-none
}
...
...
makeADIOS2
View file @
4f844dab
...
...
@@ -27,7 +27,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
.
etc/tools/ThirdPartyFunctions
#------------------------------------------------------------------------------
# ADIOS2 version from OpenFOAM etc/config.sh file:
_foam
Etc
-c
onfig
ADIOS2
_foam
C
onfig ADIOS2
adios2PACKAGE
=
${
adios2_version
:-
adios
-none
}
...
...
makeCCMIO
View file @
4f844dab
...
...
@@ -37,7 +37,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
#------------------------------------------------------------------------------
# libccmio version from OpenFOAM etc/config.sh file:
_foam
Etc
-c
onfig
ccmio
_foam
C
onfig ccmio
ccmioPACKAGE
=
${
ccmio_version
:-
libccmio
-2.6.1
}
targetType
=
lib
# Default is static linkage
...
...
makeCGAL
View file @
4f844dab
...
...
@@ -67,8 +67,8 @@ unset BOOST_ARCH_PATH CGAL_ARCH_PATH GMP_ARCH_PATH MPFR_ARCH_PATH # Purge old
# CGAL, boost and gmp/mpfr versions from OpenFOAM etc/config.sh files.
# Get compiler first and let CGAL config override GMP and MPFR
_foam
Etc
-c
onfig
compiler
_foam
Etc
-c
onfig
CGAL
_foam
C
onfig compiler
_foam
C
onfig CGAL
boostPACKAGE
=
${
boost_version
:-
boost
-system
}
gmpPACKAGE
=
${
gmp_version
:-
gmp
-system
}
...
...
makeFFTW
View file @
4f844dab
...
...
@@ -47,7 +47,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
#------------------------------------------------------------------------------
# FFTW version from OpenFOAM etc/config.sh file:
_foam
Etc
-c
onfig
FFTW
_foam
C
onfig FFTW
fftwPACKAGE
=
${
fftw_version
:-
fftw
-system
}
...
...
makeGcc
View file @
4f844dab
...
...
@@ -45,7 +45,7 @@ unset GMP_ARCH_PATH MPFR_ARCH_PATH # Purge old
WM_COMPILER_TYPE
=
ThirdParty
# Ensure we get the correct settings
# Default GCC, mpfr, gmp and mpc versions from OpenFOAM etc/config.sh file:
_foam
Etc
-c
onfig
compiler
_foam
C
onfig compiler
gmpPACKAGE
=
${
gmp_version
:-
gmp
-system
}
mpfrPACKAGE
=
${
mpfr_version
:-
mpfr
-system
}
...
...
makeGperftools
View file @
4f844dab
...
...
@@ -29,7 +29,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
#------------------------------------------------------------------------------
# Gperftools version from OpenFOAM etc/config.sh file:
_foam
Etc
-c
onfig
gperftools
_foam
C
onfig gperftools
gperftoolsPACKAGE
=
${
gperftools_version
:-
gperftools
-system
}
...
...
makeKAHIP
View file @
4f844dab
...
...
@@ -61,7 +61,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
}
.
etc/tools/ThirdPartyFunctions
#------------------------------------------------------------------------------
_foam
Etc
-c
onfig
kahip
_foam
C
onfig kahip
kahipPACKAGE
=
${
KAHIP_VERSION
:-
kahip
-system
}
targetType
=
libso
...
...
makeLLVM
View file @
4f844dab
...
...
@@ -50,7 +50,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
WM_COMPILER_TYPE
=
ThirdParty
# Ensure we get the correct settings
# LLVM/Clang version from OpenFOAM etc/config.sh file:
_foam
Etc
-c
onfig
compiler
_foam
C
onfig compiler
llvmPACKAGE
=
$clang_version
...
...
makeMETIS
View file @
4f844dab
...
...
@@ -61,7 +61,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
}
.
etc/tools/ThirdPartyFunctions
#------------------------------------------------------------------------------
_foam
Etc
-c
onfig
metis
_foam
C
onfig metis
metisPACKAGE
=
${
METIS_VERSION
:-
metis
-system
}
targetType
=
libso
...
...
makeMGridGen
View file @
4f844dab
...
...
@@ -30,7 +30,7 @@ wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
#------------------------------------------------------------------------------
# mgridgen version from OpenFOAM etc/config.sh file:
_foam
Etc
-c
onfig
mgridgen
_foam
C
onfig mgridgen
mgridgenPACKAGE
=
${
MGRIDGEN_VERSION
:-
mgridgen
-none
}
...
...
makeMPICH
View file @
4f844dab
...
...
@@ -58,7 +58,7 @@ _foamAddPath() { true; }
WM_MPLIB
=
MPICH
# Ensure we get the correct MPI
# mpich version from OpenFOAM etc/config.sh file:
_foam
Etc
-c
onfig
mpi
_foam
C
onfig mpi
mpiPACKAGE
=
${
FOAM_MPI
:-
mpich
-system
}
...
...
makeMesa
View file @
4f844dab
...
...
@@ -37,7 +37,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
unset
vtk_version mesa_version
# Purge current values
# mesa version from OpenFOAM etc/config.sh file:
_foam
Etc
-c
onfig
vtk
_foam
C
onfig vtk
mesaPACKAGE
=
$mesa_version
...
...
makeOPENMPI
View file @
4f844dab
...
...
@@ -58,7 +58,7 @@ _foamAddPath() { true; }
WM_MPLIB
=
OPENMPI
# Ensure we get the correct MPI
# openmpi version from OpenFOAM etc/config.sh file:
_foam
Etc
-c
onfig
mpi
_foam
C
onfig mpi
mpiPACKAGE
=
${
FOAM_MPI
:-
openmpi
-system
}
...
...
makeParaView
View file @
4f844dab
...
...
@@ -37,7 +37,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
unset
ParaView_VERSION
# Purge current values
# ParaView_VERSION from etc/config.sh file:
_foam
Etc
-c
onfig
paraview
_foam
C
onfig paraview
# Avoid any potential conflicts (especially if building from git)
if
[
-d
"
$ParaView_DIR
"
]
...
...
makeVTK
View file @
4f844dab
...
...
@@ -40,7 +40,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
unset
vtk_version mesa_version
# Purge current values
# vtk version from OpenFOAM etc/config.sh file:
_foam
Etc
-c
onfig
vtk
_foam
C
onfig vtk
VTK_VERSION
=
"
$vtk_version
"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment