exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ThirdParty: Various adjustments to the selection mechanism

Browse source
This commit is contained in:
Martin Beaudoin 2015-05-26 00:59:43 -04:00
parent 480e732b44
commit 0631e66ab6
5 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
etc/bashrc
View file

@ -82,7 +82,8 @@ export WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/ThirdParty
# Enabling the usage of third-party software
# This can be overriden in prefs.sh
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Use 'set' and 'unset' to adjust for your environent
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# For AllMake.stage1
export WM_THIRD_PARTY_USE_CMAKE_322=1
@ -103,8 +104,8 @@ export WM_THIRD_PARTY_USE_HWLOC_1101=1
#
# For AllMake.stage4
export WM_THIRD_PARTY_USE_QT_486=1
export WM_THIRD_PARTY_USE_PARAVIEW_431=1
#export WM_THIRD_PARTY_USE_QT_486=1
#export WM_THIRD_PARTY_USE_PARAVIEW_431=1
# Source files, possibly with some verbosity

8
etc/cshrc
View file

@ -77,11 +77,11 @@ setenv WM_THIRD_PARTY_DIR $WM_PROJECT_DIR/ThirdParty
# This can be overriden in prefs.sh
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# For AllMake.stage1
setenv WM_THIRD_PARTY_USE_CMAKE_2812 1
setenv WM_THIRD_PARTY_USE_CMAKE_322 1
#
# For AllMake.stage2
setenv WM_THIRD_PARTY_USE_OPENMPI_165 1
setenv WM_THIRD_PARTY_USE_OPENMPI_184 1
#
# For AllMake.stage3
@ -96,8 +96,8 @@ setenv WM_THIRD_PARTY_USE_HWLOC_1101 1
#
# For AllMake.stage4
setenv WM_THIRD_PARTY_USE_QT_486 1
setenv WM_THIRD_PARTY_USE_PARAVIEW_431 1
#setenv WM_THIRD_PARTY_USE_QT_486 1
#setenv WM_THIRD_PARTY_USE_PARAVIEW_431 1
# Source files, possibly with some verbosity

4
etc/prefs.csh-EXAMPLE
View file

@ -188,7 +188,7 @@
#setenv WM_THIRD_PARTY_USE_GCC_451 1
#setenv WM_THIRD_PARTY_USE_GCC_445 1
#setenv WM_THIRD_PARTY_USE_PYTHON_27 1
#setenv WM_THIRD_PARTY_USE_M4_146 1
#setenv WM_THIRD_PARTY_USE_M4_1416 1
#setenv WM_THIRD_PARTY_USE_BISON_27 1
#setenv WM_THIRD_PARTY_USE_FLEX_2535 1
setenv WM_THIRD_PARTY_USE_CMAKE_322 1
@ -220,7 +220,7 @@ setenv WM_THIRD_PARTY_USE_HWLOC_1101 1
#
# For AllMake.stage4
setenv WM_THIRD_PARTY_USE_QT_486 1
setenv WM_THIRD_PARTY_USE_PARAVIEW_401 1
setenv WM_THIRD_PARTY_USE_PARAVIEW_431 1
#setenv WM_THIRD_PARTY_USE_PARAVIEW_410 1
# ----------------------------------------------------------------- end-of-file

4
etc/prefs.sh-EXAMPLE
View file

@ -198,7 +198,7 @@ export FOAM_VERBOSE=1
#export WM_THIRD_PARTY_USE_GCC_451=1
#export WM_THIRD_PARTY_USE_GCC_445=1
#export WM_THIRD_PARTY_USE_PYTHON_27=1
#export WM_THIRD_PARTY_USE_M4_146=1
#export WM_THIRD_PARTY_USE_M4_1416=1
#export WM_THIRD_PARTY_USE_BISON_27=1
#export WM_THIRD_PARTY_USE_FLEX_2535=1
export WM_THIRD_PARTY_USE_CMAKE_322=1
@ -230,7 +230,7 @@ export WM_THIRD_PARTY_USE_HWLOC_1101=1
#
# For AllMake.stage4
export WM_THIRD_PARTY_USE_QT_486=1
export WM_THIRD_PARTY_USE_PARAVIEW_401=1
export WM_THIRD_PARTY_USE_PARAVIEW_431=1
#export WM_THIRD_PARTY_USE_PARAVIEW_410=1

6
etc/settings.sh
View file

@ -549,7 +549,7 @@ export MPI_BUFFER_SIZE
#
# In order to use a pre-installed version of the ThirdParty packages, just set the
# appropriate XXX_SYSTEM environment variable for a given package in your prefs.sh
# file in order to disable the sourcing of the ThirdParty version of the same package.
# file in order to disable the activation of the ThirdParty version of the same package.
# Load Mesquite library
# ~~~~~~~~~~~~~~~~~~~~~~
@ -638,8 +638,8 @@ export MPI_BUFFER_SIZE
# Load zoltan
# ~~~~~~~~~~
[ -z "$ZOLTAN_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_ZOLTAN_35 ] && [ -e $WM_THIRD_PARTY_DIR/packages/zoltan_3.5 ] && {
_foamSource $WM_THIRD_PARTY_DIR/packages/zoltan_3.5/platforms/$WM_OPTIONS/etc/zoltan_3.5.sh
[ -z "$ZOLTAN_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_ZOLTAN_36 ] && [ -e $WM_THIRD_PARTY_DIR/packages/zoltan_3.6 ] && {
_foamSource $WM_THIRD_PARTY_DIR/packages/zoltan_3.6/platforms/$WM_OPTIONS/etc/zoltan_3.6.sh
}
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo " ZOLTAN_DIR is initialized to: $ZOLTAN_DIR"