Commit b06a5c0c authored by brugger's avatar brugger

I modified build_visit to patch vtk so that the OpenFOAM reader is not
built since we don't need it and it doesn't compile with gcc 3.2.3.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16673 18c085ea-50e0-402c-830e-de6fd14e8384
parent 74153261
......@@ -78,6 +78,51 @@ function issue_command
return $?
}
function apply_vtk_580_patch_1
{
patch -p0 <<\EOF
diff -c a/IO/CMakeLists.txt visit-vtk-5.8/IO/CMakeLists.txt
*** a/IO/CMakeLists.txt
--- visit-vtk-5.8/IO/CMakeLists.txt
***************
*** 92,98 ****
vtkMoleculeReaderBase.cxx
vtkOBJReader.cxx
${_VTK_OGGTHEORA_SOURCES}
- vtkOpenFOAMReader.cxx
vtkOutputStream.cxx
vtkPDBReader.cxx
vtkPLOT3DReader.cxx
--- 92,97 ----
EOF
if [[ $? != 0 ]] ; then
warn "Unable to apply patch 1 to VTK 5.8.0"
return 1
else
return 0
fi
}
function apply_vtk_580_patch
{
apply_vtk_580_patch_1
if [[ $? != 0 ]] ; then
return 1
fi
}
function apply_vtk_patch
{
if [[ ${VTK_VERSION} == 5.8.0 ]] ; then
apply_vtk_580_patch
if [[ $? != 0 ]] ; then
return 1
fi
fi
return 0
}
function build_vtk
{
#
......@@ -143,6 +188,23 @@ function build_vtk
return 1
fi
#
# Apply patches
#
info "Patching VTK . . ."
apply_vtk_patch
if [[ $? != 0 ]] ; then
if [[ $untarred_vtk == 1 ]] ; then
warn "Giving up on VTK build because the patch failed."
return 1
else
warn "Patch failed, but continuing. I believe that this script\n" \
"tried to apply a patch to an existing directory which had " \
"already been patched ... that is, that the patch is " \
"failing harmlessly on a second application."
fi
fi
# Make a build directory for an out-of-source build.. Change the
# VISIT_BUILD_DIR variable to represent the out-of-source build directory.
VTK_SRC_DIR=$VTK_BUILD_DIR
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment