Commit acba9786 authored by bonnell's avatar bonnell

Update config-site for windows: added new PySide2, Conduit and Boxlib.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@31488 18c085ea-50e0-402c-830e-de6fd14e8384
parent fa8217a3
......@@ -96,12 +96,8 @@ ENDIF()
IF(PySide_FOUND)
if(VISIT_QT5)
set(pysidename "PySide2")
if(NOT WIN32)
SET_UP_THIRD_PARTY(PYSIDE lib include
SET_UP_THIRD_PARTY(PYSIDE lib include
pyside2-python${PYTHON_VERSION} shiboken2-python${PYTHON_VERSION})
else()
SET_UP_THIRD_PARTY(PYSIDE lib include pyside2 shiboken2)
endif()
else()
set(pysidename "PySide")
SET_UP_THIRD_PARTY(PYSIDE lib include
......
......@@ -35,7 +35,6 @@ SET(VISITHOME ${VISIT_WINDOWS_DIR}/${VISIT_MSVC_VERSION})
# Create the NSIS installer package (override default from root CMakeLists.txt
OPTION(VISIT_MAKE_NSIS_INSTALLER "Create an installer package using NSIS." ON)
VISIT_OPTION_DEFAULT(VISIT_QT5 true TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_USE_7ZIP true TYPE BOOL)
##############################################################
......@@ -53,36 +52,18 @@ VISIT_OPTION_DEFAULT(VISIT_BOOST_DIR ${VISITHOME}/boost_minimal_headers/1.60.0)
##
## VTK
##
IF(VISIT_QT5)
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk-qt5/${VTK_VERSION})
ELSE()
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/${VTK_VERSION})
ENDIF()
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk-qt5/${VTK_VERSION})
##
## QT
##
if (VISIT_QT5)
VISIT_OPTION_DEFAULT(VISIT_QT_DIR ${VISITHOME}/Qt/5.6.1)
else()
if(MSVC12)
SET(VISIT_QT_VERSION "4.8.6")
else()
SET(VISIT_QT_VERSION "4.8.3")
endif()
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/Qt/${VISIT_QT_VERSION}/lib)
VISIT_OPTION_DEFAULT(QT_DIR ${VISITHOME}/Qt/${VISIT_QT_VERSION})
VISIT_OPTION_DEFAULT(QT_QMAKE_EXECUTABLE ${VISIT_QT_BIN}/qmake.exe TYPE FILEPATH)
endif()
VISIT_OPTION_DEFAULT(VISIT_QT5 true TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_QT_DIR ${VISITHOME}/Qt/5.6.1)
##
## QWT
##
if (VISIT_QT5)
VISIT_OPTION_DEFAULT(VISIT_QWT_DIR ${VISITHOME}/Qwt/6.1.2)
else()
VISIT_OPTION_DEFAULT(VISIT_QWT_DIR ${VISITHOME}/Qwt-qt4/6.1.2)
endif()
VISIT_OPTION_DEFAULT(VISIT_QWT_DIR ${VISITHOME}/Qwt/6.1.2)
##
## PYTHON
......@@ -92,11 +73,8 @@ VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.7.11)
##
## PYSIDE
##
if(VISIT_QT5)
VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/PySide/2.0.0-2017.02.14)
else()
VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/PySide/1.2.2)
endif()
VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/PySide/2.0.0-2017.08.30)
##############################################################
##
......@@ -180,6 +158,13 @@ VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP
TYPE STRING
)
##
## CONDUIT
##
VISIT_OPTION_DEFAULT(VISIT_CONDUIT_DIR ${VISITHOME}/conduit/v0.3.0)
VISIT_OPTION_DEFAULT(VISIT_CONDUIT_LIBDEP
HDF5_LIBRARY_DIR HDF5_LIB ${VISIT_HDF5_LIBDEP} TYPE STRING)
##
## NETCDF
##
......@@ -192,7 +177,7 @@ VISIT_OPTION_DEFAULT(VISIT_NETCDF_LIBDEP
##
## BOXLIB
##
VISIT_OPTION_DEFAULT(VISIT_BOXLIB_DIR ${VISITHOME}/BoxLib/2011.04.28)
VISIT_OPTION_DEFAULT(VISIT_BOXLIB_DIR ${VISITHOME}/BoxLib/1.3.5)
##
## CCMIO
......@@ -258,17 +243,9 @@ VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP
##
## XDMF
##
if(VISIT_QT5)
VISIT_OPTION_DEFAULT(VISIT_XDMF_DIR ${VISITHOME}/Xdmf-vtk-qt5/2.1.1)
else()
VISIT_OPTION_DEFAULT(VISIT_XDMF_DIR ${VISITHOME}/Xdmf/2.1.1)
endif()
VISIT_OPTION_DEFAULT(VISIT_XDMF_DIR ${VISITHOME}/Xdmf-vtk-qt5/2.1.1)
VISIT_OPTION_DEFAULT(VISIT_XDMF_LIBDEP
HDF5_LIBRARY_DIR HDF5_LIB ${VISIT_HDF5_LIBDEP}
VTK_LIBRARY_DIRS vtklibxml2-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}
TYPE STRING
)
TYPE STRING)
if (MSVC11)
VISIT_OPTION_DEFAULT(VISIT_VISUS_DIR ${VISITHOME}/ViSUS/330725d)
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