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

STYLE: eliminate most use of _foamSource outside of the etc/ hierarchy

Browse Source
This commit is contained in:
Mark Olesen
2017-02-23 10:58:55 +01:00
parent cc51def1fd
commit 07ec2b3abd
4 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
etc/config.sh/example/compiler
View File

@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation |
# \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
@ -31,9 +31,10 @@
#------------------------------------------------------------------------------
# First load the standard versions, if necessary
foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode o config.sh/compiler \
2>/dev/null)
[ $? -eq 0 ] && _foamSource $foamFile
if foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode o config.sh/compiler)
then
. $foamFile
fi
unset foamFile
@ -57,7 +58,7 @@ Gcc48u)
export WM_CC='gcc-4.8'
export WM_CXX='g++-4.8'
;;
Icc)
Icc*)
# Example for ensuring that 3rd software uses the Icc compilers
export WM_CC='icc'
export WM_CXX='icpc'