Commit 88b97b41 authored by bonnell's avatar bonnell

Test qt 551 on windows.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@27866 18c085ea-50e0-402c-830e-de6fd14e8384
parent c5cc2191
......@@ -6,7 +6,7 @@ IF (MSVC_VERSION)
SET(VISIT_MSVC_VERSION "MSVC2013")
ELSEIF (MSVC11)
SET(VISIT_MSVC_VERSION "MSVC2012")
VISIT_OPTION_DEFAULT(VISIT_ENABLE_XDB ON)
VISIT_OPTION_DEFAULT(VISIT_ENABLE_XDB ON TYPE BOOL)
ELSE()
MESSAGE(SEND_ERROR "${ERRMSG}")
ENDIF()
......@@ -52,7 +52,11 @@ VISIT_OPTION_DEFAULT(VISIT_BOOST_DIR ${VISITHOME}/boost_minimal_headers/1.57.0)
## VTK
##
IF(VISIT_QT5)
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk-qt5/${VTK_VERSION})
if(VISIT_QT551)
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk-qt551/${VTK_VERSION})
else()
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk-qt5/${VTK_VERSION})
endif()
ELSE()
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/${VTK_VERSION})
ENDIF()
......@@ -61,7 +65,13 @@ ENDIF()
## QT
##
if (VISIT_QT5)
if (VISIT_QT551)
VISIT_OPTION_DEFAULT(VISIT_QT_DIR ${VISITHOME}/Qt/5.5.1)
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/Qt/5.5.1/bin)
else()
VISIT_OPTION_DEFAULT(VISIT_QT_DIR ${VISITHOME}/Qt/5.2.1)
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/Qt/5.2.1/bin)
endif()
else()
if(MSVC12)
SET(VISIT_QT_VERSION "4.8.6")
......@@ -244,7 +254,11 @@ VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP
## XDMF
##
if(VISIT_QT5)
VISIT_OPTION_DEFAULT(VISIT_XDMF_DIR ${VISITHOME}/Xdmf-vtk-qt5/2.1.1)
if (VISIT_QT551)
VISIT_OPTION_DEFAULT(VISIT_XDMF_DIR ${VISITHOME}/Xdmf-vtk-qt551/2.1.1)
else()
VISIT_OPTION_DEFAULT(VISIT_XDMF_DIR ${VISITHOME}/Xdmf-vtk-qt5/2.1.1)
endif()
else()
VISIT_OPTION_DEFAULT(VISIT_XDMF_DIR ${VISITHOME}/Xdmf/2.1.1)
endif()
......
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