Commit 91a37310 authored by bonnell's avatar bonnell

Enable python 2.7.11 and qt 5

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@27909 18c085ea-50e0-402c-830e-de6fd14e8384
parent c187fe52
......@@ -2,6 +2,7 @@
## Setup VISITHOME & VISITARCH variables.
##
SET(VISITHOME /home/biagas2/visit/thirdparty/2.10.0)
SET(VISITHOMEQT5 /home/biagas2/visit/thirdparty/2.11.0)
SET(VISITARCH linux-x86_64_gcc-4.4)
## Compiler flags.
......@@ -11,6 +12,11 @@ VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++ TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRING)
##
## VisIt QT5 Option
##
VISIT_OPTION_DEFAULT(VISIT_QT5 ON TYPE BOOL)
##
## VisIt Thread Option
##
......@@ -37,18 +43,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)
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/${VTK_VERSION}/${VISITARCH})
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
......
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