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

Changed the location of the gcc builds to ThirdParty

Browse Source
This commit is contained in:
henry
2008-06-04 11:20:46 +01:00
parent 02ce38ecb4
commit 4718db8895
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
etc/settings.csh
View File

@ -39,6 +39,7 @@ endif
alias AddPath 'set path=(\!* $path) ; if ( ! -d \!* ) mkdir -p \!*' alias AddPath 'set path=(\!* $path) ; if ( ! -d \!* ) mkdir -p \!*'
alias AddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH} ; if ( ! -d \!* ) mkdir -p \!*' alias AddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH} ; if ( ! -d \!* ) mkdir -p \!*'
#- Add the system-specific executables path to the path #- Add the system-specific executables path to the path
set path=($WM_PROJECT_DIR/bin $FOAM_INST_DIR/$WM_ARCH/bin $path) set path=($WM_PROJECT_DIR/bin $FOAM_INST_DIR/$WM_ARCH/bin $path)
@ -73,6 +74,11 @@ AddPath $FOAM_USER_APPBIN
setenv FOAM_RUN $WM_PROJECT_USER_DIR/run setenv FOAM_RUN $WM_PROJECT_USER_DIR/run
# Location of third-party software
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
set thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
# Compiler settings # Compiler settings
# ~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~
set WM_COMPILER_BIN= set WM_COMPILER_BIN=
@ -88,10 +94,10 @@ switch ("$WM_COMPILER_INST")
case OpenFOAM: case OpenFOAM:
switch ("$WM_COMPILER") switch ("$WM_COMPILER")
case Gcc43: case Gcc43:
setenv WM_COMPILER_DIR $FOAM_INST_DIR/$WM_ARCH/gcc-4.3.0$WM_COMPILER_ARCH setenv WM_COMPILER_DIR $thirdParty/gcc-4.3.0/platforms/$WM_ARCH
breaksw breaksw
case Gcc: case Gcc:
setenv WM_COMPILER_DIR $FOAM_INST_DIR/$WM_ARCH/gcc-4.2.2$WM_COMPILER_ARCH setenv WM_COMPILER_DIR $thirdParty/gcc-4.2.2/platforms/$WM_ARCH
breaksw breaksw
endsw endsw
@ -121,11 +127,6 @@ if ($?WM_COMPILER_BIN) then
endif endif
# Third-party software
# ~~~~~~~~~~~~~~~~~~~~
set thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
# MICO # MICO
# ~~~~ # ~~~~
setenv MICO_VERSION 2.3.12 setenv MICO_VERSION 2.3.12

11
etc/settings.sh
View File

@ -53,6 +53,7 @@ AddLib()
fi fi
} }
#- Add the system-specifc executables path to the path #- Add the system-specifc executables path to the path
export PATH=$WM_PROJECT_DIR/bin:$FOAM_INST_DIR/$WM_ARCH/bin:$PATH export PATH=$WM_PROJECT_DIR/bin:$FOAM_INST_DIR/$WM_ARCH/bin:$PATH
@ -85,6 +86,12 @@ AddPath $FOAM_USER_APPBIN
export FOAM_RUN=$WM_PROJECT_USER_DIR/run export FOAM_RUN=$WM_PROJECT_USER_DIR/run
# Location of third-party software
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
# Compiler settings # Compiler settings
# ~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~
WM_COMPILER_BIN= WM_COMPILER_BIN=
@ -99,10 +106,10 @@ case "$WM_COMPILER_INST" in
OpenFOAM) OpenFOAM)
case "$WM_COMPILER" in case "$WM_COMPILER" in
Gcc43) Gcc43)
export WM_COMPILER_DIR=$FOAM_INST_DIR/$WM_ARCH/gcc-4.3.0$WM_COMPILER_ARCH export WM_COMPILER_DIR=$thirdParty/gcc-4.3.0/platforms/$WM_ARCH
;; ;;
Gcc) Gcc)
export WM_COMPILER_DIR=$FOAM_INST_DIR/$WM_ARCH/gcc-4.2.2$WM_COMPILER_ARCH export WM_COMPILER_DIR=$thirdParty/gcc-4.2.2/platforms/$WM_ARCH
;; ;;
esac esac