Test harness: adjustments for C-Shell on Darwin

This commit is contained in:
Martin Beaudoin 2011-05-23 20:47:06 -04:00
parent 5e67d1852c
commit aa19e2eba0
2 changed files with 10 additions and 3 deletions

View file

@ -207,6 +207,9 @@ case Linux:
breaksw
case Darwin:
# this makes certain things easier
setenv WM_ARCH_BASE darwin
switch (`uname -p`)
case powerpc:
setenv WM_ARCH darwinPpc
@ -240,6 +243,7 @@ case Darwin:
setenv MACOSX_DEPLOYMENT_TARGET `sw_vers -productVersion`
# Use Mac-Ports-Compiler instead of Apple-gcc-4.2
if ( ! $?compilerInstall ) setenv compilerInstall System
if ( $compilerInstall == "System" ) then
switch ($WM_COMPILER)
case Gcc43:
@ -255,7 +259,7 @@ case Darwin:
setenv WM_CXX 'g++-mp-4.5'
breaksw;
endsw
setenv WM_COMPILER ""
#setenv WM_COMPILER ""
endif
breaksw

View file

@ -88,7 +88,10 @@ _foamAddLib $FOAM_USER_LIBBIN
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# compilerInstall = OpenFOAM | System
#set compilerInstall=OpenFOAM
set compilerInstall=System
#set compilerInstall=System
if ( ! $?compilerInstall ) then
setenv compilerInstall System
endif
switch ("$compilerInstall")
case OpenFOAM:
@ -444,7 +447,7 @@ if ( $?PARAVIEW_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-3.8.1
_foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1/platforms/$WM_OPTIONS/etc/ParaView-3.8.1.csh
endif
if ( $WM_ARCH == "darwinIntel" ) then
if ( $WM_ARCH == "darwinIntel" || $WM_ARCH == "darwinIntel64" ) then
setenv DYLD_LIBRARY_PATH ${LD_LIBRARY_PATH}
endif