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

etc/cshrc, etc/config.csh: foamCompiler -> WM_COMPILER_TYPE

Browse Source 
for consistency with etc/bashrc and etc/config.sh

See commit 4409a0ea5a
This commit is contained in:
Henry Weller
2016-03-09 09:05:35 +00:00
parent 80c3bcff48
commit c28a0c0d94
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/config.csh/example/prefs.csh
View File

@ -38,7 +38,7 @@
## Specify OpenFOAM ThirdParty compiler ## Specify OpenFOAM ThirdParty compiler
## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# set foamCompiler=ThirdParty # set WM_COMPILER_TYPE=ThirdParty
## Specify compiler type ## Specify compiler type
## ~~~~~~~~~~~~~~~~~~~~~ ## ~~~~~~~~~~~~~~~~~~~~~

16
etc/config.csh/settings
View File

@ -207,13 +207,13 @@ unsetenv MPFR_ARCH_PATH GMP_ARCH_PATH
# Location of compiler installation # Location of compiler installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
if ( ! $?foamCompiler ) then if ( ! $?WM_COMPILER_TYPE ) then
set foamCompiler=system set WM_COMPILER_TYPE=system
echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:" echo "Warning in $WM_PROJECT_DIR/etc/config.csh/settings:"
echo " foamCompiler not set, using '$foamCompiler'" echo " WM_COMPILER_TYPE not set, using '$WM_COMPILER_TYPE'"
endif endif
switch ("$foamCompiler") switch ("$WM_COMPILER_TYPE")
case OpenFOAM: case OpenFOAM:
case ThirdParty: case ThirdParty:
# Default versions of GMP, MPFR and MPC, overide as necessary # Default versions of GMP, MPFR and MPC, overide as necessary
@ -279,7 +279,7 @@ case ThirdParty:
echo " Cannot find $gccDir installation." echo " Cannot find $gccDir installation."
echo " Please install this compiler version or if you wish to" \ echo " Please install this compiler version or if you wish to" \
" use the system compiler," " use the system compiler,"
echo " change the 'foamCompiler' setting to 'system'" echo " change the 'WM_COMPILER_TYPE' setting to 'system'"
echo echo
endif endif
@ -315,7 +315,7 @@ case ThirdParty:
echo " Cannot find $clangDir installation." echo " Cannot find $clangDir installation."
echo " Please install this compiler version or if you wish to" \ echo " Please install this compiler version or if you wish to" \
" use the system compiler," " use the system compiler,"
echo " change the 'foamCompiler' setting to 'system'" echo " change the 'WM_COMPILER_TYPE' setting to 'system'"
echo echo
endif endif
@ -331,7 +331,7 @@ case system:
breaksw breaksw
default: default:
echo "Warn: foamCompiler='$foamCompiler' is unsupported" echo "Warn: WM_COMPILER_TYPE='$WM_COMPILER_TYPE' is unsupported"
echo " treating as 'system' instead" echo " treating as 'system' instead"
breaksw breaksw
endsw endsw
@ -341,6 +341,6 @@ endsw
# ~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~
#- keep _foamAddPath _foamAddLib _foamAddMan #- keep _foamAddPath _foamAddLib _foamAddMan
unset minBufferSize unset minBufferSize
unsetenv foamCompiler unsetenv WM_COMPILER_TYPE
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

4
etc/cshrc
View File

@ -57,8 +57,8 @@ set foamInstall = $HOME/$WM_PROJECT
if ( ! $?FOAM_INST_DIR ) setenv FOAM_INST_DIR $foamInstall if ( ! $?FOAM_INST_DIR ) setenv FOAM_INST_DIR $foamInstall
#- Compiler location: #- Compiler location:
# foamCompiler = system | ThirdParty (OpenFOAM) # WM_COMPILER_TYPE = system | ThirdParty (OpenFOAM)
setenv foamCompiler system setenv WM_COMPILER_TYPE system
#- Compiler: #- Compiler:
# WM_COMPILER = Gcc | Gcc45 | Gcc46 | Gcc47 | Gcc48 | Gcc49 | Clang | Icc # WM_COMPILER = Gcc | Gcc45 | Gcc46 | Gcc47 | Gcc48 | Gcc49 | Clang | Icc