zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-12-28 03:37:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update build scripts and etc/apps/paraview3 settings for paraview-3.5 (cvs)

Browse Source 
- The new cmake seems to be even smarter. If we try to use env variables in
  the .cmake files (eg, with And's sed fixup), they are rewritten in a
  subsequent re-make and take much longer).  Adjusting the compiler values
  themselves causes a full remake. On the positive side, disabling the rpath
  seems to mean we may not need any of this.

  In summary - yuck!
This commit is contained in:
Mark Olesen
2008-12-15 22:06:54 +01:00
parent bf057f99c0
commit 49bbb29ac8
7 changed files with 293 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
etc/apps/paraview3/bashrc
View File

@ -26,16 +26,16 @@
# paraview3/bashrc
#
# Description
# Setup file for ParaView3.
# Setup file for paraview-3.x
# Sourced from OpenFOAM-?.?/etc/bashrc
#
#------------------------------------------------------------------------------
# determine the cmake to be used
unset CMAKE_HOME
for cmake in cmake-2.6.2 cmake-2.4.6
do
cmake=$WM_THIRD_PARTY_DIR/$cmake/platforms/$WM_ARCH
if [ -r $cmake ]
then
export CMAKE_HOME=$cmake
@ -43,26 +43,30 @@ do
break
fi
done
unset cmake
export ParaView_VERSION="3.3-cvs"
paraviewMajor=paraview-3.5
export ParaView_VERSION=3.5-cvs
export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/ParaView$ParaView_VERSION
export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION
export ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
if [ "$PYTHONPATH" ]
# add in python libraries if required
paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
if [ -r $paraviewPython ]
then
export PYTHONPATH=$PYTHONPATH:$ParaView_DIR/Utilities/VTKPythonWrapping:$ParaView_DIR/lib/paraview-3.3
else
export PYTHONPATH=$ParaView_DIR/Utilities/VTKPythonWrapping:$ParaView_DIR/lib/paraview-3.3
if [ "$PYTHONPATH" ]
then
export PYTHONPATH=$PYTHONPATH:$paraviewPython:$ParaView_DIR/lib/$paraviewMajor
else
export PYTHONPATH=$paraviewPython:$ParaView_DIR/lib/$paraviewMajor
fi
fi
if [ -r $ParaView_DIR ]
then
export PATH=$ParaView_DIR/bin:$PATH
export LD_LIBRARY_PATH=$ParaView_DIR/bin:$LD_LIBRARY_PATH
export PV_PLUGIN_PATH=$FOAM_LIBBIN
fi
unset cmake paraviewMajor paraviewPython
# -----------------------------------------------------------------------------

38
etc/apps/paraview3/cshrc
View File

@ -26,34 +26,42 @@
# paraview3/cshrc
#
# Description
# Startup File for Paraview3
# Startup File for paraview-3.x
# Sourced from OpenFOAM-?.?/etc/cshrc
#
#------------------------------------------------------------------------------
setenv CMAKE_HOME $WM_THIRD_PARTY_DIR/cmake-2.4.6/platforms/$WM_ARCH
# determine the cmake to be used
unsetenv CMAKE_HOME
foreach cmake ( cmake-2.6.2 cmake-2.4.6 )
set cmake=$WM_THIRD_PARTY_DIR/$cmake/platforms/$WM_ARCH
if ( -r $cmake ) then
setenv CMAKE_HOME $cmake
set path=($CMAKE_HOME/bin $path)
break
endif
end
if ( -r $CMAKE_HOME ) then
set path=($CMAKE_HOME/bin $path)
else
unsetenv CMAKE_HOME
endif
set paraviewMajor=paraview-3.5
setenv ParaView_VERSION 3.5-cvs
setenv ParaView_VERSION 3.3-cvs
setenv ParaView_INST_DIR $WM_THIRD_PARTY_DIR/ParaView$ParaView_VERSION
setenv ParaView_INST_DIR $WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION
setenv ParaView_DIR $ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
if ($?PYTHONPATH) then
setenv PYTHONPATH ${PYTHONPATH}:$ParaView_DIR/Utilities/VTKPythonWrapping:$ParaView_DIR/lib/paraview-3.3
else
setenv PYTHONPATH $ParaView_DIR/Utilities/VTKPythonWrapping:$ParaView_DIR/lib/paraview-3.3
# add in python libraries if required
set paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
if ( -r $paraviewPython ) then
if ($?PYTHONPATH) then
setenv PYTHONPATH ${PYTHONPATH}:$paraviewPython:$ParaView_DIR/lib/${paraviewMajor}
else
setenv PYTHONPATH $paraviewPython:$ParaView_DIR/lib/${paraviewMajor}
endif
endif
if ( -r $ParaView_INST_DIR ) then
set path=($ParaView_DIR/bin $path)
setenv LD_LIBRARY_PATH $ParaView_DIR/bin:$LD_LIBRARY_PATH
setenv PV_PLUGIN_PATH $FOAM_LIBBIN
endif
unset cmake paraviewMajor paraviewPython
# -----------------------------------------------------------------------------