Commit cffb8366 authored by bonnell's avatar bonnell
Browse files

turn on QT5

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@27897 18c085ea-50e0-402c-830e-de6fd14e8384
parent 1842051d
......@@ -9,8 +9,10 @@
## Setup VISITHOME & VISITARCH variables.
##
SET(VISITHOME /usr/gapps/visit/thirdparty_shared/2.10.0)
SET(VISITHOMEQT5 /usr/gapps/visit/thirdparty_shared/2.11.0)
SET(VISITARCH linux-x86_64_gcc-4.4)
VISIT_OPTION_DEFAULT(VISIT_SLIVR TRUE)
VISIT_OPTION_DEFAULT(VISIT_SLIVR TRUE TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_QT5 TRUE TYPE BOOL)
## Compiler flags.
##
......@@ -65,19 +67,30 @@ VISIT_OPTION_DEFAULT(VISIT_MESA_DIR ${VISITHOME}/mesa/7.10.2/${VISITARCH})
##
## Python
##
if(VISIT_QT5)
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOMEQT5}/python/2.7.11/${VISITARCH})
else()
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.7.6/${VISITARCH})
endif()
##
## Qt
##
if(VISIT_QT5)
VISIT_OPTION_DEFAULT(VISIT_QT_DIR ${VISITHOMEQT5}/qt/5.5.1/${VISITARCH})
else()
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/qt/4.8.3/${VISITARCH}/bin)
endif()
##
## VTK
##
SETUP_APP_VERSION(VTK 6.1.0)
if(VISIT_QT5)
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOMEQT5}/vtk/${VTK_VERSION}/${VISITARCH})
else()
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/${VTK_VERSION}/${VISITARCH})
##
endif()
##
## AdvIO
......@@ -114,7 +127,7 @@ VISIT_OPTION_DEFAULT(VISIT_SZIP_DIR ${VISITHOME}/szip/2.1/${VISITARCH})
## HDF5
##
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.14/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz /usr/lib z TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP ${VISIT_SZIP_DIR}/lib sz /usr/lib z TYPE STRING)
##
## CGNS
......@@ -142,7 +155,7 @@ VISIT_OPTION_DEFAULT(VISIT_H5PART_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBD
## HDF4
##
VISIT_OPTION_DEFAULT(VISIT_HDF4_DIR ${VISITHOME}/hdf4/4.2.5/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF4_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz ${VISITHOME}/vtk/${VTK_VERSION}/${VISITARCH}/lib vtkjpeg-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_HDF4_LIBDEP ${VISIT_SZIP_DIR}/lib sz ${VISIT_VTK_DIR}/lib vtkjpeg-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} TYPE STRING)
##
## Ice-T
......@@ -194,7 +207,9 @@ VISIT_OPTION_DEFAULT(VISIT_NEKTAR++_LIBDEP /usr/lib z TYPE STRING)
##
## PySide
##
if(NOT VISIT_QT5)
VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/pyside/1.2.2/${VISITARCH}/)
endif()
##
## Silo
......
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