songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CONFIG: permit an empty value for WM_COMPILE_OPTION, WM_COMPILER_TYPE

Browse Source 
- an empty WM_COMPILE_OPTION is treated internally (in make rules)
  like "Opt"

- an empty WM_COMPILER_TYPE is treated like "system" (system compiler)
This commit is contained in:
Mark Olesen 2019-12-17 11:48:25 +01:00
parent e0d555ccdb
commit bc0b02c651
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Allwmake
View File

@ -32,7 +32,7 @@ echo
echo "========================================" echo "========================================"
date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown" date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"
echo "Starting compile ${WM_PROJECT_DIR##*/} ${0##*/}" echo "Starting compile ${WM_PROJECT_DIR##*/} ${0##*/}"
echo " $WM_COMPILER $WM_COMPILER_TYPE compiler" echo " $WM_COMPILER ${WM_COMPILER_TYPE:-system} compiler"
echo " ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}" echo " ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
echo "========================================" echo "========================================"
echo echo
@ -79,7 +79,7 @@ echo
date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown" date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"
echo "========================================" echo "========================================"
echo " ${WM_PROJECT_DIR##*/}" echo " ${WM_PROJECT_DIR##*/}"
echo " $WM_COMPILER $WM_COMPILER_TYPE compiler" echo " $WM_COMPILER ${WM_COMPILER_TYPE:-system} compiler"
echo " ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}" echo " ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
echo echo
echo " api = $(foamEtcFile -show-api 2>/dev/null)" echo " api = $(foamEtcFile -show-api 2>/dev/null)"

5
etc/config.csh/settings
View File

@ -21,7 +21,6 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
setenv WM_ARCH `uname -s` # System name setenv WM_ARCH `uname -s` # System name
if (! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt # Default: Optimize
set archOption=64 set archOption=64
if ($?WM_ARCH_OPTION) then if ($?WM_ARCH_OPTION) then
@ -31,6 +30,7 @@ endif
unsetenv WM_ARCH_OPTION # Compiling 32-bit on 64-bit system unsetenv WM_ARCH_OPTION # Compiling 32-bit on 64-bit system
setenv WM_COMPILER_ARCH # Host compiler type (when different than target) setenv WM_COMPILER_ARCH # Host compiler type (when different than target)
setenv WM_COMPILER_LIB_ARCH # Additional ending for lib directories setenv WM_COMPILER_LIB_ARCH # Additional ending for lib directories
if (! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION
# Adjust according to system and architecture # Adjust according to system and architecture
switch ($WM_ARCH) switch ($WM_ARCH)
@ -299,9 +299,10 @@ CLANG_NOT_FOUND
endif endif
breaksw breaksw
case -*:
case system-*: case system-*:
case ThirdParty-*: case ThirdParty-*:
# Using system compiler or other ThirdParty compiler # Using empty (system), system compiler or other ThirdParty compiler
breaksw breaksw
default: default:

5
etc/config.sh/settings
View File

@ -21,7 +21,6 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
export WM_ARCH="$(uname -s)" # System name export WM_ARCH="$(uname -s)" # System name
: ${WM_COMPILE_OPTION:=Opt}; export WM_COMPILE_OPTION # Default: Optimize
archOption="${WM_ARCH_OPTION:-64}" archOption="${WM_ARCH_OPTION:-64}"
unset WM_ARCH_OPTION # Compiling 32-bit on 64-bit system unset WM_ARCH_OPTION # Compiling 32-bit on 64-bit system
@ -290,8 +289,8 @@ CLANG_NOT_FOUND
fi fi
;; ;;
system-* | ThirdParty-*) -* | system-* | ThirdParty-*)
# Using system compiler or other ThirdParty compiler # Using empty (system), system compiler or other ThirdParty compiler
;; ;;
*) *)