Commit 55d2e73e authored by bonnell's avatar bonnell
Browse files

Change build_visit to use vtk-5.0.0e, use vtk-5.0.0e on windows

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@11218 18c085ea-50e0-402c-830e-de6fd14e8384
parent 2d64bf25
...@@ -26,7 +26,7 @@ SET(VISITHOME ${VISIT_WINDOWS_DIR}/ThirdParty) ...@@ -26,7 +26,7 @@ SET(VISITHOME ${VISIT_WINDOWS_DIR}/ThirdParty)
VISIT_OPTION_DEFAULT(VISIT_MESA_DIR ${VISITHOME}/Mesa) VISIT_OPTION_DEFAULT(VISIT_MESA_DIR ${VISITHOME}/Mesa)
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk-5.0.0d/${VISIT_MSVC_VERSION}/lib/vtk-5.0) VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk-5.0.0e/${VISIT_MSVC_VERSION}/lib/vtk-5.0)
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/Qt/lib/${VISIT_MSVC_VERSION}) VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/Qt/lib/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(QT_DIR ${VISITHOME}/Qt) VISIT_OPTION_DEFAULT(QT_DIR ${VISITHOME}/Qt)
SET(QT_QMAKE_EXECUTABLE ${VISIT_QT_BIN}/qmake.exe) SET(QT_QMAKE_EXECUTABLE ${VISIT_QT_BIN}/qmake.exe)
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
# Qt qt-everywhere-opensource-src-4.6.1.tar.gz # Qt qt-everywhere-opensource-src-4.6.1.tar.gz
# Mesa MesaLib-7.5.tar.gz # Mesa MesaLib-7.5.tar.gz
# Python Python-2.6.4tgz # Python Python-2.6.4tgz
# VTK vtk-5.0.0d.tar.gz # VTK vtk-5.0.0e.tar.gz
# CMake cmake-2.8.0.tar.gz # CMake cmake-2.8.0.tar.gz
# #
# The following optional libraries need to be in the current directory # The following optional libraries need to be in the current directory
...@@ -884,6 +884,10 @@ ...@@ -884,6 +884,10 @@
# Jeremy Meredith, Mon May 3 12:58:17 EDT 2010 # Jeremy Meredith, Mon May 3 12:58:17 EDT 2010
# Added patch to fix undefined _environ issue in python in OS X 10.4. # Added patch to fix undefined _environ issue in python in OS X 10.4.
# #
# Kathleen Bonnell, Mon May 3 14:55:55 PDT 2010
# Use of vtk-5.0.0e.
#
#
# ***************************************************************************** # *****************************************************************************
# # # #
# *************************************************************************** # # *************************************************************************** #
...@@ -1184,8 +1188,8 @@ fi ...@@ -1184,8 +1188,8 @@ fi
export VISIT_VERSION=${VISIT_VERSION:-"2.0.0"} export VISIT_VERSION=${VISIT_VERSION:-"2.0.0"}
export VISIT_FILE=${VISIT_FILE:-"visit${VISIT_VERSION}.tar.gz"} export VISIT_FILE=${VISIT_FILE:-"visit${VISIT_VERSION}.tar.gz"}
export VTK_FILE=${VTK_FILE:-"vtk-5.0.0d.tar.gz"} export VTK_FILE=${VTK_FILE:-"vtk-5.0.0e.tar.gz"}
export VTK_VERSION=${VTK_VERSION:-"5.0.0d"} export VTK_VERSION=${VTK_VERSION:-"5.0.0e"}
export VTK_BUILD_DIR=${VTK_BUILD_DIR:-"VTK"} export VTK_BUILD_DIR=${VTK_BUILD_DIR:-"VTK"}
export CMAKE_FILE=${CMAKE_FILE:-"cmake-2.8.0.tar.gz"} export CMAKE_FILE=${CMAKE_FILE:-"cmake-2.8.0.tar.gz"}
...@@ -3880,7 +3884,7 @@ function apply_vtk_500d_patch ...@@ -3880,7 +3884,7 @@ function apply_vtk_500d_patch
function apply_vtk_patch function apply_vtk_patch
{ {
if [[ ${VTK_VERSION} == 5.0.0d ]] ; then if [[ ${VTK_VERSION} == 5.0.0e ]] ; then
apply_vtk_500d_patch apply_vtk_500d_patch
if [[ $? != 0 ]] ; then if [[ $? != 0 ]] ; then
return 1 return 1
......
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