Test harness: adjustments for C-Shell

This commit is contained in:
beaudoin 2011-05-23 18:55:02 -04:00
parent c7b0a4b58a
commit 2e4439087c
2 changed files with 23 additions and 15 deletions

View file

@ -240,20 +240,23 @@ case Darwin:
setenv MACOSX_DEPLOYMENT_TARGET `sw_vers -productVersion`
# Use Mac-Ports-Compiler instead of Apple-gcc-4.2
switch ($WM_COMPILER)
case Gcc43:
setenv WM_CC 'gcc-mp-4.3'
setenv WM_CXX 'g++-mp-4.3'
breaksw;
case Gcc44:
setenv WM_CC 'gcc-mp-4.4'
setenv WM_CXX 'g++-mp-4.4'
breaksw;
case Gcc45:
setenv WM_CC 'gcc-mp-4.5'
setenv WM_CXX 'g++-mp-4.5'
breaksw;
endsw
if ( $compilerInstall == "System" ) then
switch ($WM_COMPILER)
case Gcc43:
setenv WM_CC 'gcc-mp-4.3'
setenv WM_CXX 'g++-mp-4.3'
breaksw;
case Gcc44:
setenv WM_CC 'gcc-mp-4.4'
setenv WM_CXX 'g++-mp-4.4'
breaksw;
case Gcc45:
setenv WM_CC 'gcc-mp-4.5'
setenv WM_CXX 'g++-mp-4.5'
breaksw;
endsw
endif
setenv WM_COMPILER ""
breaksw

View file

@ -98,6 +98,11 @@ case OpenFOAM:
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
breaksw
case Gcc44:
_foamSource $WM_THIRD_PARTY_DIR/packages/mpfr-3.0.1/platforms/$WM_OPTIONS/etc/mpfr-3.0.1.csh
_foamSource $WM_THIRD_PARTY_DIR/packages/gmp-5.0.1/platforms/$WM_OPTIONS/etc/gmp-5.0.1.csh
_foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.4.5/platforms/$WM_OPTIONS/etc/gcc-4.4.5.csh
breaksw
case Gcc43:
setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
@ -127,7 +132,7 @@ endsw
switch ("$WM_COMPILER")
case Gcc:
case Gcc*:
setenv WM_CC 'gcc'
setenv WM_CXX 'g++'
breaksw