Commit 9206969c authored by bonnell's avatar bonnell
Browse files

Update VisIt's vtk to incorporate minor modifications that allow building on...

Update VisIt's vtk to incorporate minor modifications that allow building on 64-bit windows platforms.
Created new tag (vtk-5.0.0h).
Updated vtk libs/dlls for windows build.
Added config-site file for my laptop (deluxe).
Fixed FindNSIS so it would work when running 64-bit version of cmake on windows.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@13058 18c085ea-50e0-402c-830e-de6fd14e8384
parent d6625057
SET(VISIT_NSIS_SEARCHPATH)
IF (WIN32)
SET(VISIT_NSIS_SEARCHPATH "$ENV{PROGRAMFILES}/NSIS")
SET(VISIT_NSIS_SEARCHPATH "$ENV{PROGRAMFILES}/NSIS"
"$ENV{PROGRAMFILES(X86)}/NSIS")
ENDIF (WIN32)
FIND_PROGRAM(MAKENSIS
......
include(${VISIT_SOURCE_DIR}/config-site/windows.cmake)
# can provide overrides for windows.cmake settings below
\ No newline at end of file
......@@ -36,16 +36,12 @@ SET(VISITHOME ${VISIT_WINDOWS_DIR}/ThirdParty)
VISIT_OPTION_DEFAULT(VISIT_MESA_DIR ${VISITHOME}/Mesa)
#We actually want GTE 1500
IF(MSVC_VERSION GREATER 1499 OR CMAKE_CL_64)
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk-5.0.1a/${VISIT_MSVC_VERSION}/lib/vtk-5.0)
ELSE(MSVC_VERSION GREATER 1499 OR CMAKE_CL_64)
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk-5.0.0e/${VISIT_MSVC_VERSION}/lib/vtk-5.0)
ENDIF(MSVC_VERSION GREATER 1499 OR CMAKE_CL_64)
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk-5.0.0h/${VISIT_MSVC_VERSION}/lib/vtk-5.0)
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/Qt/lib/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(QT_DIR ${VISITHOME}/Qt)
SET(QT_QMAKE_EXECUTABLE ${VISIT_QT_BIN}/qmake.exe)
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/Python26/${VISIT_MSVC_VERSION})
......
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